core: attach types to functions

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>

10 files changed, 73 insertions, 69 deletions

diff --git a/crates/parser/src/lib.rs b/crates/parser/src/lib.rs
index 0618683..ae6cc4d 100644
--- a/crates/parser/src/lib.rs
+++ b/crates/parser/src/lib.rs
@@ -20,7 +20,7 @@ mod log {
 mod conversion;
 mod error;
 mod module;
-use alloc::vec::Vec;
+use alloc::{string::ToString, vec::Vec};
 pub use error::*;
 use module::ModuleReader;
 use tinywasm_types::WasmFunction;
@@ -103,15 +103,26 @@ impl TryFrom<ModuleReader> for TinyWasmModule {
             return Err(ParseError::EndNotReached);
         }
 
-        let func_types = reader.func_addrs;
+        let code_type_addrs = reader.code_type_addrs;
+        let local_function_count = reader.code.len();
+
+        if code_type_addrs.len() != local_function_count {
+            return Err(ParseError::Other("Code and code type address count mismatch".to_string()));
+        }
+
         let funcs = reader
             .code
             .into_iter()
-            .zip(func_types)
-            .map(|(f, ty)| WasmFunction {
-                instructions: f.body,
-                locals: f.locals,
-                ty_addr: ty,
+            .zip(code_type_addrs)
+            .map(|(f, ty_idx)| {
+                (
+                    ty_idx,
+                    WasmFunction {
+                        instructions: f.body,
+                        locals: f.locals,
+                        ty: reader.func_types.get(ty_idx as usize).unwrap().clone(),
+                    },
+                )
             })
             .collect::<Vec<_>>();
 
@@ -119,17 +130,17 @@ impl TryFrom<ModuleReader> for TinyWasmModule {
         let table_types = reader.table_types;
 
         Ok(TinyWasmModule {
-            version: reader.version,
-            start_func: reader.start_func,
-            func_types: reader.func_types.into_boxed_slice(),
             funcs: funcs.into_boxed_slice(),
-            exports: reader.exports.into_boxed_slice(),
+            func_types: reader.func_types.into_boxed_slice(),
             globals: globals.into_boxed_slice(),
             table_types: table_types.into_boxed_slice(),
-            memory_types: reader.memory_types.into_boxed_slice(),
             imports: reader.imports.into_boxed_slice(),
+            version: reader.version,
+            start_func: reader.start_func,
             data: reader.data.into_boxed_slice(),
+            exports: reader.exports.into_boxed_slice(),
             elements: reader.elements.into_boxed_slice(),
+            memory_types: reader.memory_types.into_boxed_slice(),
         })
     }
 }
diff --git a/crates/parser/src/module.rs b/crates/parser/src/module.rs
index 660a702..811c51f 100644
--- a/crates/parser/src/module.rs
+++ b/crates/parser/src/module.rs
@@ -17,7 +17,10 @@ pub struct ModuleReader {
     pub start_func: Option<u32>,
 
     pub func_types: Vec<FuncType>,
-    pub func_addrs: Vec<u32>,
+
+    // map from local function index to type index
+    pub code_type_addrs: Vec<u32>,
+
     pub exports: Vec<Export>,
     pub code: Vec<CodeSection>,
     pub globals: Vec<Global>,
@@ -36,7 +39,7 @@ impl Debug for ModuleReader {
         f.debug_struct("ModuleReader")
             .field("version", &self.version)
             .field("func_types", &self.func_types)
-            .field("func_addrs", &self.func_addrs)
+            .field("func_addrs", &self.code_type_addrs)
             .field("code", &self.code)
             .field("exports", &self.exports)
             .field("globals", &self.globals)
@@ -88,13 +91,13 @@ impl ModuleReader {
                     .collect::<Result<Vec<FuncType>>>()?;
             }
             FunctionSection(reader) => {
-                if !self.func_addrs.is_empty() {
+                if !self.code_type_addrs.is_empty() {
                     return Err(ParseError::DuplicateSection("Function section".into()));
                 }
 
                 debug!("Found function section");
                 validator.function_section(&reader)?;
-                self.func_addrs = reader.into_iter().map(|f| Ok(f?)).collect::<Result<Vec<_>>>()?;
+                self.code_type_addrs = reader.into_iter().map(|f| Ok(f?)).collect::<Result<Vec<_>>>()?;
             }
             GlobalSection(reader) => {
                 if !self.globals.is_empty() {
@@ -148,9 +151,7 @@ impl ModuleReader {
                 debug!("Found code section entry");
                 let v = validator.code_section_entry(&function)?;
                 let func_validator = v.into_validator(Default::default());
-
-                self.code
-                    .push(conversion::convert_module_code(function, func_validator)?);
+                self.code.push(conversion::convert_module_code(function, func_validator)?);
             }
             ImportSection(reader) => {
                 if !self.imports.is_empty() {
@@ -168,10 +169,8 @@ impl ModuleReader {
 
                 debug!("Found export section");
                 validator.export_section(&reader)?;
-                self.exports = reader
-                    .into_iter()
-                    .map(|e| conversion::convert_module_export(e?))
-                    .collect::<Result<Vec<_>>>()?;
+                self.exports =
+                    reader.into_iter().map(|e| conversion::convert_module_export(e?)).collect::<Result<Vec<_>>>()?;
             }
             End(offset) => {
                 debug!("Reached end of module");
@@ -191,12 +190,7 @@ impl ModuleReader {
             //     validator.tag_section(&tag)?;
             // }
             UnknownSection { .. } => return Err(ParseError::UnsupportedSection("Unknown section".into())),
-            section => {
-                return Err(ParseError::UnsupportedSection(format!(
-                    "Unsupported section: {:?}",
-                    section
-                )))
-            }
+            section => return Err(ParseError::UnsupportedSection(format!("Unsupported section: {:?}", section))),
         };
 
         Ok(())
diff --git a/crates/tinywasm/src/imports.rs b/crates/tinywasm/src/imports.rs
index 6b60fbd..a6c07b5 100644
--- a/crates/tinywasm/src/imports.rs
+++ b/crates/tinywasm/src/imports.rs
@@ -25,11 +25,10 @@ pub enum Function {
 }
 
 impl Function {
-    /// Get the function's type
-    pub fn ty(&self, module: &crate::ModuleInstance) -> tinywasm_types::FuncType {
+    pub(crate) fn ty(&self) -> &FuncType {
         match self {
-            Self::Host(f) => f.ty.clone(),
-            Self::Wasm(f) => module.func_ty(f.ty_addr).clone(),
+            Self::Host(f) => &f.ty,
+            Self::Wasm(f) => &f.ty,
         }
     }
 }
@@ -309,7 +308,10 @@ impl Imports {
                         Extern::Global(g) => store.add_global(g.ty, g.val.into(), idx)?,
                         Extern::Table(t) => store.add_table(t.ty, idx)?,
                         Extern::Memory(m) => store.add_mem(m.ty, idx)?,
-                        Extern::Func(f) => store.add_func(f, idx)?,
+                        Extern::Func(f) => {
+                            let ImportKind::Func(import_type) = import.kind else { unreachable!() };
+                            store.add_func(f, import_type, idx)?
+                        }
                     };
 
                     // store the link
diff --git a/crates/tinywasm/src/instance.rs b/crates/tinywasm/src/instance.rs
index 5465125..3732832 100644
--- a/crates/tinywasm/src/instance.rs
+++ b/crates/tinywasm/src/instance.rs
@@ -24,6 +24,7 @@ pub(crate) struct ModuleInstanceInner {
     pub(crate) idx: ModuleInstanceAddr,
 
     pub(crate) types: Box<[FuncType]>,
+
     pub(crate) func_addrs: Vec<FuncAddr>,
     pub(crate) table_addrs: Vec<TableAddr>,
     pub(crate) mem_addrs: Vec<MemAddr>,
@@ -59,31 +60,22 @@ impl ModuleInstance {
         addrs.globals.extend(store.init_globals(data.globals.into(), idx)?);
         addrs.funcs.extend(store.init_funcs(data.funcs.into(), idx)?);
         addrs.tables.extend(store.init_tables(data.table_types.into(), idx)?);
-
-        log::info!("init_mems: {:?}", addrs.mems);
         addrs.mems.extend(store.init_mems(data.memory_types.into(), idx)?);
-        log::info!("init_mems2: {:?}", addrs.mems);
-        log::info!("init_mems g: {:?}", store.data.mems.len());
 
         let elem_addrs = store.init_elems(&addrs.tables, data.elements.into(), idx)?;
-        log::info!("init_elems: {:?}", addrs.mems);
-
         let data_addrs = store.init_datas(&addrs.mems, data.data.into(), idx)?;
-        log::info!("init_datas: {:?}", addrs.mems);
 
         let instance = ModuleInstanceInner {
             store_id: store.id(),
             idx,
 
             types: data.func_types,
-
             func_addrs: addrs.funcs,
             table_addrs: addrs.tables,
             mem_addrs: addrs.mems,
             global_addrs: addrs.globals,
             elem_addrs,
             data_addrs,
-
             func_start: data.start_func,
             imports: data.imports,
             exports: data.exports,
@@ -166,7 +158,7 @@ impl ModuleInstance {
         };
 
         let func_inst = store.get_func(func_addr as usize)?;
-        let ty = func_inst.func.ty(self);
+        let ty = func_inst.func.ty();
 
         Ok(FuncHandle { addr: func_addr, module: self.clone(), name: Some(name.to_string()), ty: ty.clone() })
     }
@@ -206,11 +198,10 @@ impl ModuleInstance {
         };
 
         let func_addr = self.0.func_addrs.get(func_index as usize).expect("No func addr for start func, this is a bug");
-
         let func_inst = store.get_func(*func_addr as usize)?;
-        let ty = func_inst.func.ty(self);
+        let ty = func_inst.func.ty();
 
-        Ok(Some(FuncHandle { module: self.clone(), addr: *func_addr, ty, name: None }))
+        Ok(Some(FuncHandle { module: self.clone(), addr: *func_addr, ty: ty.clone(), name: None }))
     }
 
     /// Invoke the start function of the module
diff --git a/crates/tinywasm/src/runtime/executor/mod.rs b/crates/tinywasm/src/runtime/executor/mod.rs
index ab2ab9b..58b1520 100644
--- a/crates/tinywasm/src/runtime/executor/mod.rs
+++ b/crates/tinywasm/src/runtime/executor/mod.rs
@@ -7,7 +7,6 @@ use crate::{
     CallFrame, Error, FuncContext, LabelArgs, ModuleInstance, Result, Store, Trap,
 };
 use alloc::{string::ToString, vec::Vec};
-use log::info;
 use tinywasm_types::{ElementKind, Instruction};
 
 mod macros;
@@ -132,6 +131,7 @@ fn exec_one(
             // prepare the call frame
             let func_idx = module.resolve_func_addr(*v);
             let func_inst = store.get_func(func_idx as usize)?;
+
             let func = match &func_inst.func {
                 crate::Function::Wasm(ref f) => f,
                 crate::Function::Host(host_func) => {
@@ -145,13 +145,7 @@ fn exec_one(
                 }
             };
 
-            log::info!("wasm call, ty: {:?}", func.ty_addr);
-            log::info!("tys: {:?}", module.0.types);
-            let func_ty = func_inst.func.ty(module);
-
-            info!("params: {:?}", func_ty.params);
-            info!("stack: {:?}", stack.values);
-            let params = stack.values.pop_n_rev(func_ty.params.len())?;
+            let params = stack.values.pop_n_rev(func.ty.params.len())?;
             let call_frame = CallFrame::new_raw(func_idx as usize, &params, func.locals.to_vec());
 
             // push the call frame
@@ -175,17 +169,18 @@ fn exec_one(
 
             // prepare the call frame
             let func_inst = store.get_func(resolved_func_addr as usize)?;
+            let func_ty = func_inst.func.ty();
+
             let func = match &func_inst.func {
                 crate::Function::Wasm(ref f) => f,
                 crate::Function::Host(host_func) => {
                     let func = host_func.func.clone();
-                    let params = stack.values.pop_params(&host_func.ty.params)?;
+                    let params = stack.values.pop_params(&func_ty.params)?;
                     let res = (func)(FuncContext { store, module }, &params)?;
                     stack.values.extend_from_typed(&res);
                     return Ok(ExecResult::Ok);
                 }
             };
-            let func_ty = module.func_ty(func.ty_addr);
 
             if func_ty != call_ty {
                 return Err(
diff --git a/crates/tinywasm/src/runtime/stack/value_stack.rs b/crates/tinywasm/src/runtime/stack/value_stack.rs
index cfd534c..db8468c 100644
--- a/crates/tinywasm/src/runtime/stack/value_stack.rs
+++ b/crates/tinywasm/src/runtime/stack/value_stack.rs
@@ -91,9 +91,7 @@ impl ValueStack {
 
         let mut res = Vec::with_capacity(types.len());
         for ty in types.iter() {
-            let v = self.pop()?;
-            let v = v.attach_type(*ty);
-            res.push(v.into());
+            res.push(self.pop()?.attach_type(*ty));
         }
 
         Ok(res)
diff --git a/crates/tinywasm/src/store.rs b/crates/tinywasm/src/store.rs
index 15b0c2f..c53f5fc 100644
--- a/crates/tinywasm/src/store.rs
+++ b/crates/tinywasm/src/store.rs
@@ -110,13 +110,23 @@ impl Store {
     }
 
     /// Add functions to the store, returning their addresses in the store
-    pub(crate) fn init_funcs(&mut self, funcs: Vec<WasmFunction>, idx: ModuleInstanceAddr) -> Result<Vec<FuncAddr>> {
+    pub(crate) fn init_funcs(
+        &mut self,
+        funcs: Vec<(u32, WasmFunction)>,
+        idx: ModuleInstanceAddr,
+    ) -> Result<Vec<FuncAddr>> {
         let func_count = self.data.funcs.len();
         let mut func_addrs = Vec::with_capacity(func_count);
-        for (i, func) in funcs.into_iter().enumerate() {
-            self.data.funcs.push(Rc::new(FunctionInstance { func: Function::Wasm(func), _owner: idx }));
+
+        for (i, (type_idx, func)) in funcs.into_iter().enumerate() {
+            self.data.funcs.push(Rc::new(FunctionInstance {
+                func: Function::Wasm(func),
+                _type_idx: type_idx,
+                _owner: idx,
+            }));
             func_addrs.push((i + func_count) as FuncAddr);
         }
+
         Ok(func_addrs)
     }
 
@@ -287,8 +297,8 @@ impl Store {
         Ok(self.data.mems.len() as MemAddr - 1)
     }
 
-    pub(crate) fn add_func(&mut self, func: Function, idx: ModuleInstanceAddr) -> Result<FuncAddr> {
-        self.data.funcs.push(Rc::new(FunctionInstance { func, _owner: idx }));
+    pub(crate) fn add_func(&mut self, func: Function, type_idx: TypeAddr, idx: ModuleInstanceAddr) -> Result<FuncAddr> {
+        self.data.funcs.push(Rc::new(FunctionInstance { func, _type_idx: type_idx, _owner: idx }));
         Ok(self.data.funcs.len() as FuncAddr - 1)
     }
 
@@ -372,6 +382,9 @@ impl Store {
 /// See <https://webassembly.github.io/spec/core/exec/runtime.html#function-instances>
 pub struct FunctionInstance {
     pub(crate) func: Function,
+
+    // TODO: this is important for call_indirect
+    pub(crate) _type_idx: TypeAddr,
     pub(crate) _owner: ModuleInstanceAddr, // index into store.module_instances, none for host functions
 }
 
diff --git a/crates/tinywasm/tests/generated/mvp.csv b/crates/tinywasm/tests/generated/mvp.csv
index 6fb3476..a21f4e4 100644
--- a/crates/tinywasm/tests/generated/mvp.csv
+++ b/crates/tinywasm/tests/generated/mvp.csv
@@ -2,4 +2,4 @@
 0.0.5,11135,9093,[{"name":"address.wast","passed":1,"failed":259},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":78,"failed":13},{"name":"binary.wast","passed":107,"failed":5},{"name":"block.wast","passed":170,"failed":53},{"name":"br.wast","passed":20,"failed":77},{"name":"br_if.wast","passed":29,"failed":89},{"name":"br_table.wast","passed":24,"failed":150},{"name":"call.wast","passed":18,"failed":73},{"name":"call_indirect.wast","passed":34,"failed":136},{"name":"comments.wast","passed":5,"failed":3},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":25,"failed":594},{"name":"custom.wast","passed":10,"failed":1},{"name":"data.wast","passed":22,"failed":39},{"name":"elem.wast","passed":27,"failed":72},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":90,"failed":6},{"name":"f32.wast","passed":1018,"failed":1496},{"name":"f32_bitwise.wast","passed":4,"failed":360},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":1018,"failed":1496},{"name":"f64_bitwise.wast","passed":4,"failed":360},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":1,"failed":7},{"name":"float_exprs.wast","passed":275,"failed":625},{"name":"float_literals.wast","passed":112,"failed":51},{"name":"float_memory.wast","passed":0,"failed":90},{"name":"float_misc.wast","passed":138,"failed":303},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":81,"failed":91},{"name":"func_ptrs.wast","passed":7,"failed":29},{"name":"global.wast","passed":50,"failed":60},{"name":"i32.wast","passed":85,"failed":375},{"name":"i64.wast","passed":31,"failed":385},{"name":"if.wast","passed":116,"failed":125},{"name":"imports.wast","passed":23,"failed":160},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":38,"failed":70},{"name":"int_literals.wast","passed":25,"failed":26},{"name":"labels.wast","passed":13,"failed":16},{"name":"left-to-right.wast","passed":0,"failed":96},{"name":"linking.wast","passed":5,"failed":127},{"name":"load.wast","passed":59,"failed":38},{"name":"local_get.wast","passed":18,"failed":18},{"name":"local_set.wast","passed":38,"failed":15},{"name":"local_tee.wast","passed":41,"failed":56},{"name":"loop.wast","passed":42,"failed":78},{"name":"memory.wast","passed":30,"failed":49},{"name":"memory_grow.wast","passed":11,"failed":85},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":1,"failed":181},{"name":"names.wast","passed":484,"failed":2},{"name":"nop.wast","passed":4,"failed":84},{"name":"return.wast","passed":20,"failed":64},{"name":"select.wast","passed":28,"failed":120},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":4,"failed":16},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":39,"failed":19},{"name":"traps.wast","passed":4,"failed":32},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":0,"failed":64},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":9,"failed":41},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
 0.1.0,17630,2598,[{"name":"address.wast","passed":5,"failed":255},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":110,"failed":2},{"name":"block.wast","passed":193,"failed":30},{"name":"br.wast","passed":84,"failed":13},{"name":"br_if.wast","passed":90,"failed":28},{"name":"br_table.wast","passed":25,"failed":149},{"name":"call.wast","passed":29,"failed":62},{"name":"call_indirect.wast","passed":36,"failed":134},{"name":"comments.wast","passed":7,"failed":1},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":371,"failed":248},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":50,"failed":49},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":92,"failed":4},{"name":"f32.wast","passed":2514,"failed":0},{"name":"f32_bitwise.wast","passed":364,"failed":0},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":2514,"failed":0},{"name":"f64_bitwise.wast","passed":364,"failed":0},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":2,"failed":6},{"name":"float_exprs.wast","passed":761,"failed":139},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":6,"failed":84},{"name":"float_misc.wast","passed":437,"failed":4},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":124,"failed":48},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":51,"failed":59},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":120,"failed":121},{"name":"imports.wast","passed":74,"failed":109},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":108,"failed":0},{"name":"int_literals.wast","passed":51,"failed":0},{"name":"labels.wast","passed":14,"failed":15},{"name":"left-to-right.wast","passed":1,"failed":95},{"name":"linking.wast","passed":21,"failed":111},{"name":"load.wast","passed":60,"failed":37},{"name":"local_get.wast","passed":32,"failed":4},{"name":"local_set.wast","passed":50,"failed":3},{"name":"local_tee.wast","passed":68,"failed":29},{"name":"loop.wast","passed":93,"failed":27},{"name":"memory.wast","passed":34,"failed":45},{"name":"memory_grow.wast","passed":12,"failed":84},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":2,"failed":180},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":46,"failed":42},{"name":"return.wast","passed":73,"failed":11},{"name":"select.wast","passed":86,"failed":62},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":9,"failed":11},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":22,"failed":14},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":50,"failed":14},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":35,"failed":15},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
 0.2.0,19344,884,[{"name":"address.wast","passed":181,"failed":79},{"name":"align.wast","passed":156,"failed":0},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":112,"failed":0},{"name":"block.wast","passed":220,"failed":3},{"name":"br.wast","passed":97,"failed":0},{"name":"br_if.wast","passed":118,"failed":0},{"name":"br_table.wast","passed":171,"failed":3},{"name":"call.wast","passed":73,"failed":18},{"name":"call_indirect.wast","passed":50,"failed":120},{"name":"comments.wast","passed":7,"failed":1},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":439,"failed":180},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":56,"failed":43},{"name":"endianness.wast","passed":29,"failed":40},{"name":"exports.wast","passed":92,"failed":4},{"name":"f32.wast","passed":2514,"failed":0},{"name":"f32_bitwise.wast","passed":364,"failed":0},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":2514,"failed":0},{"name":"f64_bitwise.wast","passed":364,"failed":0},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":6,"failed":2},{"name":"float_exprs.wast","passed":890,"failed":10},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":78,"failed":12},{"name":"float_misc.wast","passed":437,"failed":4},{"name":"forward.wast","passed":5,"failed":0},{"name":"func.wast","passed":168,"failed":4},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":103,"failed":7},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":231,"failed":10},{"name":"imports.wast","passed":80,"failed":103},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":108,"failed":0},{"name":"int_literals.wast","passed":51,"failed":0},{"name":"labels.wast","passed":26,"failed":3},{"name":"left-to-right.wast","passed":92,"failed":4},{"name":"linking.wast","passed":29,"failed":103},{"name":"load.wast","passed":93,"failed":4},{"name":"local_get.wast","passed":36,"failed":0},{"name":"local_set.wast","passed":53,"failed":0},{"name":"local_tee.wast","passed":93,"failed":4},{"name":"loop.wast","passed":116,"failed":4},{"name":"memory.wast","passed":78,"failed":1},{"name":"memory_grow.wast","passed":91,"failed":5},{"name":"memory_redundancy.wast","passed":8,"failed":0},{"name":"memory_size.wast","passed":35,"failed":7},{"name":"memory_trap.wast","passed":180,"failed":2},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":78,"failed":10},{"name":"return.wast","passed":84,"failed":0},{"name":"select.wast","passed":114,"failed":34},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":7,"failed":0},{"name":"start.wast","passed":11,"failed":9},{"name":"store.wast","passed":68,"failed":0},{"name":"switch.wast","passed":28,"failed":0},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":36,"failed":0},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":64,"failed":0},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":50,"failed":0},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
-0.3.0-alpha.0,20069,159,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":156,"failed":0},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":112,"failed":0},{"name":"block.wast","passed":223,"failed":0},{"name":"br.wast","passed":97,"failed":0},{"name":"br_if.wast","passed":118,"failed":0},{"name":"br_table.wast","passed":174,"failed":0},{"name":"call.wast","passed":91,"failed":0},{"name":"call_indirect.wast","passed":169,"failed":1},{"name":"comments.wast","passed":8,"failed":0},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":619,"failed":0},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":61,"failed":0},{"name":"elem.wast","passed":84,"failed":15},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":93,"failed":3},{"name":"f32.wast","passed":2514,"failed":0},{"name":"f32_bitwise.wast","passed":364,"failed":0},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":2514,"failed":0},{"name":"f64_bitwise.wast","passed":364,"failed":0},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":8,"failed":0},{"name":"float_exprs.wast","passed":900,"failed":0},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":90,"failed":0},{"name":"float_misc.wast","passed":441,"failed":0},{"name":"forward.wast","passed":5,"failed":0},{"name":"func.wast","passed":172,"failed":0},{"name":"func_ptrs.wast","passed":36,"failed":0},{"name":"global.wast","passed":110,"failed":0},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":241,"failed":0},{"name":"imports.wast","passed":107,"failed":76},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":108,"failed":0},{"name":"int_literals.wast","passed":51,"failed":0},{"name":"labels.wast","passed":29,"failed":0},{"name":"left-to-right.wast","passed":96,"failed":0},{"name":"linking.wast","passed":68,"failed":64},{"name":"load.wast","passed":97,"failed":0},{"name":"local_get.wast","passed":36,"failed":0},{"name":"local_set.wast","passed":53,"failed":0},{"name":"local_tee.wast","passed":97,"failed":0},{"name":"loop.wast","passed":120,"failed":0},{"name":"memory.wast","passed":79,"failed":0},{"name":"memory_grow.wast","passed":96,"failed":0},{"name":"memory_redundancy.wast","passed":8,"failed":0},{"name":"memory_size.wast","passed":42,"failed":0},{"name":"memory_trap.wast","passed":182,"failed":0},{"name":"names.wast","passed":486,"failed":0},{"name":"nop.wast","passed":88,"failed":0},{"name":"return.wast","passed":84,"failed":0},{"name":"select.wast","passed":148,"failed":0},{"name":"skip-stack-guard-page.wast","passed":11,"failed":0},{"name":"stack.wast","passed":7,"failed":0},{"name":"start.wast","passed":20,"failed":0},{"name":"store.wast","passed":68,"failed":0},{"name":"switch.wast","passed":28,"failed":0},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":36,"failed":0},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":64,"failed":0},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":50,"failed":0},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
+0.3.0-alpha.0,20071,157,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":156,"failed":0},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":112,"failed":0},{"name":"block.wast","passed":223,"failed":0},{"name":"br.wast","passed":97,"failed":0},{"name":"br_if.wast","passed":118,"failed":0},{"name":"br_table.wast","passed":174,"failed":0},{"name":"call.wast","passed":91,"failed":0},{"name":"call_indirect.wast","passed":169,"failed":1},{"name":"comments.wast","passed":8,"failed":0},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":619,"failed":0},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":61,"failed":0},{"name":"elem.wast","passed":84,"failed":15},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":93,"failed":3},{"name":"f32.wast","passed":2514,"failed":0},{"name":"f32_bitwise.wast","passed":364,"failed":0},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":2514,"failed":0},{"name":"f64_bitwise.wast","passed":364,"failed":0},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":8,"failed":0},{"name":"float_exprs.wast","passed":900,"failed":0},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":90,"failed":0},{"name":"float_misc.wast","passed":441,"failed":0},{"name":"forward.wast","passed":5,"failed":0},{"name":"func.wast","passed":172,"failed":0},{"name":"func_ptrs.wast","passed":36,"failed":0},{"name":"global.wast","passed":110,"failed":0},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":241,"failed":0},{"name":"imports.wast","passed":108,"failed":75},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":108,"failed":0},{"name":"int_literals.wast","passed":51,"failed":0},{"name":"labels.wast","passed":29,"failed":0},{"name":"left-to-right.wast","passed":96,"failed":0},{"name":"linking.wast","passed":69,"failed":63},{"name":"load.wast","passed":97,"failed":0},{"name":"local_get.wast","passed":36,"failed":0},{"name":"local_set.wast","passed":53,"failed":0},{"name":"local_tee.wast","passed":97,"failed":0},{"name":"loop.wast","passed":120,"failed":0},{"name":"memory.wast","passed":79,"failed":0},{"name":"memory_grow.wast","passed":96,"failed":0},{"name":"memory_redundancy.wast","passed":8,"failed":0},{"name":"memory_size.wast","passed":42,"failed":0},{"name":"memory_trap.wast","passed":182,"failed":0},{"name":"names.wast","passed":486,"failed":0},{"name":"nop.wast","passed":88,"failed":0},{"name":"return.wast","passed":84,"failed":0},{"name":"select.wast","passed":148,"failed":0},{"name":"skip-stack-guard-page.wast","passed":11,"failed":0},{"name":"stack.wast","passed":7,"failed":0},{"name":"start.wast","passed":20,"failed":0},{"name":"store.wast","passed":68,"failed":0},{"name":"switch.wast","passed":28,"failed":0},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":36,"failed":0},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":64,"failed":0},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":50,"failed":0},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
diff --git a/crates/tinywasm/tests/test-wast.rs b/crates/tinywasm/tests/test-wast.rs
index a0825b0..a50a612 100644
--- a/crates/tinywasm/tests/test-wast.rs
+++ b/crates/tinywasm/tests/test-wast.rs
@@ -30,7 +30,7 @@ fn main() -> Result<()> {
 }
 
 fn test_wast(wast_file: &str) -> Result<()> {
-    TestSuite::set_log_level(log::LevelFilter::Info);
+    TestSuite::set_log_level(log::LevelFilter::Debug);
 
     let args = std::env::args().collect::<Vec<_>>();
     println!("args: {:?}", args);
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index 96866d3..87581e1 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -42,7 +42,7 @@ pub struct TinyWasmModule {
     pub start_func: Option<FuncAddr>,
 
     /// The functions of the WebAssembly module.
-    pub funcs: Box<[WasmFunction]>,
+    pub funcs: Box<[(u32, WasmFunction)]>,
 
     /// The types of the WebAssembly module.
     pub func_types: Box<[FuncType]>,
@@ -355,9 +355,9 @@ impl FuncType {
 
 #[derive(Debug, Clone)]
 pub struct WasmFunction {
-    pub ty_addr: TypeAddr,
     pub instructions: Box<[Instruction]>,
     pub locals: Box<[ValType]>,
+    pub ty: FuncType,
 }
 
 /// A WebAssembly Module Export