Release 0.9.0-alpha.0

[email protected]
[email protected]
[email protected]
[email protected]
[email protected]

Generated by cargo-workspaces

Author: explodingcamera

Cargo.lock

@@ -4,15 +4,15 @@ default-members=[".", "crates/tinywasm", "crates/types", "crates/parser"]
 resolver="2"
 
 [workspace.dependencies]
-wast="218"
-wat="1.218"
+wast="219"
+wat="1.219"
 eyre="0.6"
 log="0.4"
 pretty_env_logger="0.5"
 criterion={version="0.5", default-features=false, features=["cargo_bench_support", "rayon"]}
 
 [workspace.package]
-version="0.8.0"
+version="0.9.0-alpha.0"
 rust-version="1.81"
 edition="2021"
 license="MIT OR Apache-2.0"

Cargo.toml

@@ -15,7 +15,7 @@ path="src/bin.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tinywasm={version="0.8.0-alpha.0", path="../tinywasm", features=["std", "parser"]}
+tinywasm={version="0.9.0-alpha.0", path="../tinywasm", features=["std", "parser"]}
 argh="0.1"
 eyre={workspace=true}
 log={workspace=true}

crates/cli/Cargo.toml

@@ -9,9 +9,9 @@ repository.workspace=true
 rust-version.workspace=true
 
 [dependencies]
-wasmparser={version="0.218", default-features=false, features=["validate", "features"]}
+wasmparser={version="0.219", default-features=false, features=["validate", "features"]}
 log={workspace=true, optional=true}
-tinywasm-types={version="0.8.0-alpha.0", path="../types", default-features=false}
+tinywasm-types={version="0.9.0-alpha.0", path="../types", default-features=false}
 
 [features]
 default=["std", "logging"]

crates/parser/Cargo.toml

@@ -203,8 +203,8 @@ pub(crate) fn convert_module_code(
         }
     }
 
-    let (body, allocations) = process_operators_and_validate(validator, func, local_addr_map)?;
-    Ok(((body, local_counts), allocations))
+    let (body, data, allocations) = process_operators_and_validate(validator, func, local_addr_map)?;
+    Ok(((body, data, local_counts), allocations))
 }
 
 pub(crate) fn convert_module_type(ty: wasmparser::RecGroup) -> Result<FuncType> {

crates/parser/src/conversion.rs

@@ -61,10 +61,11 @@ impl Parser {
             function_references: true,
             tail_call: true,
             multi_memory: true,
-            memory64: false,
             simd: true,
+            memory64: true,
             custom_page_sizes: true,
 
+            wide_arithmetic: false,
             gc_types: true,
             stack_switching: false,
             component_model: false,

crates/parser/src/lib.rs

@@ -3,12 +3,12 @@ use crate::{conversion, ParseError, Result};
 use alloc::string::ToString;
 use alloc::{boxed::Box, format, vec::Vec};
 use tinywasm_types::{
-    Data, Element, Export, FuncType, Global, Import, Instruction, MemoryType, TableType, TinyWasmModule, ValType,
-    ValueCounts, ValueCountsSmall, WasmFunction,
+    Data, Element, Export, FuncType, Global, Import, Instruction, MemoryType, TableType, TinyWasmModule, ValueCounts,
+    ValueCountsSmall, WasmFunction, WasmFunctionData,
 };
 use wasmparser::{FuncValidatorAllocations, Payload, Validator};
 
-pub(crate) type Code = (Box<[Instruction]>, ValueCounts);
+pub(crate) type Code = (Box<[Instruction]>, WasmFunctionData, ValueCounts);
 
 #[derive(Default)]
 pub(crate) struct ModuleReader {
@@ -179,7 +179,6 @@ impl ModuleReader {
         Ok(())
     }
 
-    #[inline]
     pub(crate) fn into_module(self) -> Result<TinyWasmModule> {
         if !self.end_reached {
             return Err(ParseError::EndNotReached);
@@ -193,18 +192,10 @@ impl ModuleReader {
             .code
             .into_iter()
             .zip(self.code_type_addrs)
-            .map(|((instructions, locals), ty_idx)| {
-                let mut params = ValueCountsSmall::default();
+            .map(|((instructions, data, locals), ty_idx)| {
                 let ty = self.func_types.get(ty_idx as usize).expect("No func type for func, this is a bug").clone();
-                for param in &ty.params {
-                    match param {
-                        ValType::I32 | ValType::F32 => params.c32 += 1,
-                        ValType::I64 | ValType::F64 => params.c64 += 1,
-                        ValType::V128 => params.c128 += 1,
-                        ValType::RefExtern | ValType::RefFunc => params.cref += 1,
-                    }
-                }
-                WasmFunction { instructions, locals, params, ty }
+                let params = ValueCountsSmall::from(&ty.params);
+                WasmFunction { instructions, data, locals, params, ty }
             })
             .collect::<Vec<_>>()
             .into_boxed_slice();