feat: move linker to separate crate

Signed-off-by: Florian Hartung <florian.hartung@dlr.de>

Author: florianhartung

Cargo.lock

@@ -4,12 +4,14 @@ members = [
   "crates/benchmark",
   "crates/checked",
   "crates/compare-testsuite-rs",
+  "crates/linker",
   "crates/log_wrapper",
 ]
 resolver = "2"
 
 [workspace.dependencies]
 checked = { path = "crates/checked" }
+linker = { path = "crates/linker" }
 wasm-interpreter = { path = "." }
 
 env_logger = "0.10.1"
@@ -44,7 +46,7 @@ libm = "=0.2.8"
 log_wrapper.path = "crates/log_wrapper"
 
 [dev-dependencies]
-checked.workspace = true
+checked = { workspace = true, features = ["linker"] }
 
 bumpalo = "3.17.0"
 env_logger = { workspace = true }

Cargo.toml

@@ -6,6 +6,8 @@ rust-version = "1.87.0" # Keep this in sync with the requirements!
 
 [dependencies]
 wasm-interpreter.workspace = true
+linker = { workspace = true, optional = true }
 
 [features]
-# TODO: interop, linker
+# linker
+# TODO: interop

crates/checked/Cargo.toml

@@ -33,17 +33,20 @@ use core::sync::atomic::{AtomicU64, Ordering};
 use alloc::vec::Vec;
 
 mod interop;
-mod linker;
 mod store;
 mod stored_types;
 mod value;
 
 pub use interop::*;
-pub use linker::*;
 pub use store::*;
 pub use stored_types::*;
 pub use value::*;
 
+#[cfg(feature = "linker")]
+mod linker;
+#[cfg(feature = "linker")]
+pub use linker::*;
+
 /// A unique identifier for a specific [`Store`]
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct StoreId(u64);

crates/checked/src/lib.rs

@@ -9,7 +9,7 @@ use crate::{
 
 #[derive(Default)]
 pub struct Linker {
-    inner: wasm::linker::Linker,
+    inner: linker::Linker,
 
     /// This is for the checked API which makes sure that all objects used
     /// originate from the same [`Store`].

crates/checked/src/linker.rs

@@ -0,0 +1,8 @@
+[package]
+name = "linker"
+version = "0.2.0"
+edition = "2024"
+rust-version = "1.87.0" # Keep this in sync with the requirements!
+
+[dependencies]
+wasm-interpreter.workspace = true

crates/linker/Cargo.toml

@@ -0,0 +1 @@
+# A Name Resolution Based Linker

crates/linker/README.md

@@ -1,16 +1,26 @@
+//! A Name Resolution Based Linker
+
+#![no_std]
+#![deny(
+    clippy::missing_safety_doc,
+    clippy::undocumented_unsafe_blocks,
+    unsafe_op_in_unsafe_fn
+)]
+
+extern crate alloc;
+
 use alloc::{
     borrow::ToOwned,
     collections::btree_map::{BTreeMap, Entry},
     string::String,
     vec::Vec,
 };
 
-use crate::{
-    addrs::ModuleAddr, store::InstantiationOutcome, ExternVal, RuntimeError, Store, ValidationInfo,
+use wasm::{
+    ExternVal, RuntimeError, Store, ValidationInfo, addrs::ModuleAddr, config::Config,
+    store::InstantiationOutcome,
 };
 
-use super::config::Config;
-
 /// A linker used to link a module's imports against extern values previously
 /// defined in this [`Linker`] context.
 ///
@@ -98,12 +108,12 @@ impl Linker {
     ) -> Result<(), RuntimeError> {
         // SAFETY: The caller ensures that the given module address is valid in
         // the given store.
-        let module = unsafe { store.modules.get(module) };
-        for export in &module.exports {
+        let module_exports = unsafe { store.instance_exports_unchecked(module) };
+        for export in module_exports {
             // SAFETY: The module and thus also its exported extern values come
             // from the same store used now. Therefore, the extern values must
             // be valid in this store.
-            unsafe { self.define_unchecked(module_name.clone(), export.0.clone(), *export.1)? };
+            unsafe { self.define_unchecked(module_name.clone(), export.0, export.1)? };
         }
 
         Ok(())

src/execution/linker.rs crates/linker/src/lib.rssrc/execution/linker.rs renamed to crates/linker/src/lib.rs

@@ -14,7 +14,6 @@ pub mod const_interpreter_loop;
 pub mod error;
 pub mod interop;
 mod interpreter_loop;
-pub mod linker;
 pub(crate) mod little_endian;
 pub mod resumable;
 pub mod store;