memory imports

src/core/reader/types/import.rs

@@ -6,7 +6,7 @@ use crate::core::reader::{WasmReadable, WasmReader};
 use crate::execution::assert_validated::UnwrapValidatedExt;
 use crate::{unreachable_validated, Error, Result};
 
-use super::TableType;
+use super::{MemType, TableType};
 
 #[derive(Debug)]
 pub struct Import {
@@ -52,7 +52,7 @@ pub enum ImportDesc {
     Table(TableType),
     // TODO TableType
     #[allow(dead_code)]
-    Mem(()),
+    Mem(MemType),
     // TODO MemType
     #[allow(dead_code)]
     Global(()), // TODO GlobalType
@@ -64,7 +64,7 @@ impl WasmReadable for ImportDesc {
             0x00 => Self::Func(wasm.read_var_u32()? as TypeIdx),
             // https://webassembly.github.io/spec/core/binary/types.html#table-types
             0x01 => Self::Table(TableType::read(wasm)?),
-            0x02 => todo!("read MemType"),
+            0x02 => Self::Mem(MemType::read(wasm)?),
             0x03 => todo!("read GlobalType"),
             other => return Err(Error::InvalidImportDesc(other)),
         };
@@ -76,7 +76,7 @@ impl WasmReadable for ImportDesc {
         match wasm.read_u8().unwrap_validated() {
             0x00 => Self::Func(wasm.read_var_u32().unwrap_validated() as TypeIdx),
             0x01 => Self::Table(TableType::read_unvalidated(wasm)),
-            0x02 => todo!("read MemType"),
+            0x02 => Self::Mem(MemType::read_unvalidated(wasm)),
             0x03 => todo!("read GlobalType"),
             _ => unreachable_validated!(),
         }

src/execution/execution_info.rs

@@ -3,27 +3,40 @@ use alloc::vec::Vec;
 
 use crate::core::reader::types::FuncType;
 use crate::core::reader::WasmReader;
+use crate::core::sidetable::Sidetable;
 use crate::execution::Store;
 
 /// ExecutionInfo is a compilation of relevant information needed by the [interpreter loop](
 /// crate::execution::interpreter_loop::run). The lifetime annotation `'r` represents that this structure needs to be
 /// valid at least as long as the [RuntimeInstance](crate::execution::RuntimeInstance) that creates it.
-pub struct ExecutionInfo<'r> {
+pub struct ExecutionInfo {
     pub name: String,
-    pub wasm_bytecode: &'r [u8],
-    pub wasm_reader: WasmReader<'r>,
     pub fn_types: Vec<FuncType>,
     pub store: Store,
 }
 
-impl<'r> ExecutionInfo<'r> {
-    pub fn new(name: &str, wasm_bytecode: &'r [u8], fn_types: Vec<FuncType>, store: Store) -> Self {
+impl ExecutionInfo {
+    pub fn new(name: &str, fn_types: Vec<FuncType>, store: Store) -> Self {
         ExecutionInfo {
             name: name.to_string(),
-            wasm_bytecode,
-            wasm_reader: WasmReader::new(wasm_bytecode),
             fn_types,
             store,
         }
     }
 }
+
+pub struct StateData<'r> {
+    pub wasm_bytecode: &'r [u8],
+    pub wasm_reader: WasmReader<'r>,
+    pub sidetables: Vec<Sidetable>,
+}
+
+impl<'r> StateData<'r> {
+    pub fn new(wasm_bytecode: &'r [u8], sidetables: Vec<Sidetable>) -> Self {
+        StateData {
+            wasm_bytecode,
+            wasm_reader: WasmReader::new(wasm_bytecode),
+            sidetables,
+        }
+    }
+}