Merge branch 'main' into rf-use-u64-for-memory

README.md

@@ -60,22 +60,23 @@ The new Wasmi engine supports a variety of WebAssembly proposals and will suppor
 
 | WebAssembly Proposal | Status | Comment |
 |:--|:--:|:--|
-| [`mutable-global`] | ✅ | ≥ `0.14.0`. |
-| [`saturating-float-to-int`] | ✅ | ≥ `0.14.0`. |
-| [`sign-extension`] | ✅ | ≥ `0.14.0`. |
-| [`multi-value`] | ✅ | ≥ `0.14.0`. |
-| [`bulk-memory`] | ✅ | ≥ `0.24.0`. [(#628)] |
-| [`reference-types`] | ✅ | ≥ `0.24.0`. [(#635)] |
-| [`tail-calls`] | ✅ | ≥ `0.28.0`. [(#683)] |
-| [`extended-const`] | ✅ | ≥ `0.29.0`. [(#707)] |
-| [`multi-memory`] | ✅ | ≥ `0.37.0`. [(#1191)] |
+| [`mutable-global`] | ✅ | ≥ `0.14.0` |
+| [`saturating-float-to-int`] | ✅ | ≥ `0.14.0` |
+| [`sign-extension`] | ✅ | ≥ `0.14.0` |
+| [`multi-value`] | ✅ | ≥ `0.14.0` |
+| [`bulk-memory`] | ✅ | ≥ `0.24.0` [(#628)] |
+| [`reference-types`] | ✅ | ≥ `0.24.0` [(#635)] |
+| [`tail-calls`] | ✅ | ≥ `0.28.0` [(#683)] |
+| [`extended-const`] | ✅ | ≥ `0.29.0` [(#707)] |
+| [`multi-memory`] | ✅ | ≥ `0.37.0` [(#1191)] |
+| [`custom-page-sizes`] | ✅ | ≥ `0.41.0` [(#1197)] |
 | [`simd`] | ❌ | Unlikely to be supported. |
 | [`relaxed-simd`] | ❌ | Unlikely to be supported. Depends on `simd`. |
 | [`function-references`] | 📅 | Not yet implemented. [(#774)] |
 | [`gc`] | 📅 | Not yet implemented. [(#775)] |
 | [`threads`] | 📅 | Not yet implemented. [(#777)] |
 | [`exception-handling`] | 📅 | Not yet implemented. [(#1037)] |
-| [`custom-page-sizes`] | 📅 | Not yet implemented. [(#1197)] |
+| [`memory64`] | 📅 | Not yet implemented. [(#1357)] |
 | | |
 | [WASI] | 👨‍🔬 | Experimental support for WASI (`wasip1`) via the [`wasmi_wasi` crate]. |
 | [C-API] | 👨‍🔬 | Experimental support for the official Wasm C-API via the [`wasmi_c_api_impl` crate]. |
@@ -96,6 +97,7 @@ The new Wasmi engine supports a variety of WebAssembly proposals and will suppor
 [`relaxed-simd`]: https://github.com/WebAssembly/relaxed-simd
 [`exception-handling`]: https://github.com/WebAssembly/exception-handling
 [`custom-page-sizes`]: https://github.com/WebAssembly/custom-page-sizes
+[`memory64`]: https://github.com/WebAssembly/memory64
 
 [WASI]: https://github.com/WebAssembly/WASI
 [C-API]: https://github.com/WebAssembly/wasm-c-api
@@ -117,6 +119,7 @@ The new Wasmi engine supports a variety of WebAssembly proposals and will suppor
 [(#1037)]: https://github.com/wasmi-labs/wasmi/issues/1137
 [(#1197)]: https://github.com/wasmi-labs/wasmi/issues/1197
 [(#1191)]: https://github.com/wasmi-labs/wasmi/issues/1191
+[(#1357)]: https://github.com/wasmi-labs/wasmi/issues/1357
 
 ## Development
 

crates/core/src/lib.rs

@@ -16,7 +16,6 @@ mod host_error;
 mod nan_preserving_float;
 mod trap;
 mod typed;
-mod units;
 mod untyped;
 mod value;
 
@@ -40,7 +39,6 @@ pub use self::{
     nan_preserving_float::{F32, F64},
     trap::{Trap, TrapCode},
     typed::{Typed, TypedVal},
-    units::Pages,
     untyped::{DecodeUntypedSlice, EncodeUntypedSlice, UntypedError, UntypedVal},
     value::ValType,
 };