refactor: move registry to its own source file

Signed-off-by: Cem Onem <cem.oenem@dlr.de>

Author: cemonem

src/execution/mod.rs

@@ -19,6 +19,7 @@ pub mod hooks;
 mod interpreter_loop;
 pub(crate) mod linear_memory;
 pub(crate) mod locals;
+pub mod registry;
 pub mod store;
 pub mod value;
 pub mod value_stack;

src/execution/registry.rs

@@ -0,0 +1,62 @@
+use crate::{Error, ModuleInst};
+
+use alloc::borrow::Cow;
+use alloc::collections::BTreeMap;
+
+use crate::ExternVal;
+
+#[derive(Debug, PartialEq, PartialOrd, Eq, Ord)]
+struct ImportKey {
+    module_name: Cow<'static, str>,
+    name: Cow<'static, str>,
+}
+#[derive(Default, Debug)]
+pub struct Registry(BTreeMap<ImportKey, ExternVal>);
+
+impl Registry {
+    pub fn register(
+        &mut self,
+        module_name: Cow<'static, str>,
+        name: Cow<'static, str>,
+        extern_val: ExternVal,
+    ) -> Result<(), Error> {
+        if self
+            .0
+            .insert(ImportKey { module_name, name }, extern_val)
+            .is_some()
+        {
+            return Err(Error::InvalidImportType);
+        }
+
+        Ok(())
+    }
+
+    pub fn lookup(
+        &self,
+        module_name: Cow<'static, str>,
+        name: Cow<'static, str>,
+    ) -> Result<&ExternVal, Error> {
+        // Note: We cannot do a `&str` lookup on a [`String`] map key.
+        // Thus we have to use `Cow<'static, str>` as a key
+        // (at least this prevents allocations with static names).
+        self.0
+            .get(&ImportKey { module_name, name })
+            .ok_or(Error::UnknownImport)
+    }
+
+    pub fn register_module(
+        &mut self,
+        module_name: Cow<'static, str>,
+        module_inst: &ModuleInst,
+    ) -> Result<(), Error> {
+        for (entity_name, extern_val) in &module_inst.exports {
+            // FIXME this clones module_name. Maybe prevent by using `Cow<'static, Arc<str>>`.
+            self.register(
+                module_name.clone(),
+                Cow::Owned(entity_name.clone()),
+                *extern_val,
+            )?;
+        }
+        Ok(())
+    }
+}

src/execution/store.rs

@@ -14,9 +14,10 @@ use crate::core::sidetable::Sidetable;
 use crate::execution::interpreter_loop::{memory_init, table_init};
 use crate::execution::value::{Ref, Value};
 use crate::execution::{run_const_span, Stack};
+use crate::registry::Registry;
 use crate::value::FuncAddr;
 use crate::{Error, Limits, RefType, RuntimeError, ValidationInfo};
-use alloc::borrow::{Cow, ToOwned};
+use alloc::borrow::ToOwned;
 use alloc::collections::btree_map::BTreeMap;
 use alloc::string::String;
 use alloc::vec;
@@ -1027,57 +1028,3 @@ pub struct ModuleInst<'b> {
     // sidetable is not in the spec, but required for control flow
     pub sidetable: Sidetable,
 }
-
-#[derive(Debug, PartialEq, PartialOrd, Eq, Ord)]
-struct ImportKey {
-    module_name: Cow<'static, str>,
-    name: Cow<'static, str>,
-}
-#[derive(Default, Debug)]
-pub struct Registry(BTreeMap<ImportKey, ExternVal>);
-
-impl Registry {
-    pub fn register(
-        &mut self,
-        module_name: Cow<'static, str>,
-        name: Cow<'static, str>,
-        extern_val: ExternVal,
-    ) -> Result<(), Error> {
-        if self
-            .0
-            .insert(ImportKey { module_name, name }, extern_val)
-            .is_some()
-        {
-            return Err(Error::InvalidImportType);
-        }
-
-        Ok(())
-    }
-
-    pub fn lookup(
-        &self,
-        module_name: Cow<'static, str>,
-        name: Cow<'static, str>,
-    ) -> Result<&ExternVal, Error> {
-        // Note: We cannot do a &str lookup on a [`String`] map key. Thus we have to use `Cow<'static, str> as a key (at least this prevents allocations with static names).
-        self.0
-            .get(&ImportKey { module_name, name })
-            .ok_or(Error::UnknownImport)
-    }
-
-    pub fn register_module(
-        &mut self,
-        module_name: Cow<'static, str>,
-        module_inst: &ModuleInst,
-    ) -> Result<(), Error> {
-        for (entity_name, extern_val) in &module_inst.exports {
-            // FIXME this clones module_name. Maybe prevent by using `Cow<'static, Arc<str>>`.
-            self.register(
-                module_name.clone(),
-                Cow::Owned(entity_name.clone()),
-                *extern_val,
-            )?;
-        }
-        Ok(())
-    }
-}