fixup! feat: implement memory.atomic.notify,wait32,wait64

Signed-off-by: Harald Hoyer <[email protected]>
bytecodealliance · Nov 17, 2022 · 74003f8 · 74003f8
1 parent 95df1a8
commit 74003f8
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 292 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -86,7 +86,7 @@ members = [
   "crates/cli-flags",
   "crates/environ/fuzz",
   "crates/jit-icache-coherence",
-  "crates/parking_spot",
+  "crates/wasmtime-parking_spot",
   "crates/winch",
   "examples/fib-debug/wasm",
   "examples/wasi/wasm",

diff --git a/crates/parking_spot/LICENSE-APACHE b/crates/parking_spot/LICENSE-APACHE
diff --git a/crates/parking_spot/LICENSE-MIT b/crates/parking_spot/LICENSE-MIT
diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
@@ -26,7 +26,7 @@ anyhow = { workspace = true }
 memfd = "0.6.1"
 paste = "1.0.3"
 encoding_rs = { version = "0.8.31", optional = true }
-parking_spot = { path = "../parking_spot", version = "0.1.0" }
+wasmtime-parking_spot = { path = "../wasmtime-parking_spot" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 mach = "0.3.2"

diff --git a/crates/runtime/src/instance.rs b/crates/runtime/src/instance.rs
@@ -196,6 +196,17 @@ impl Instance {
         }
     }
 
+    /// Get a locally defined or imported memory.
+    pub(crate) fn get_runtime_memory(&mut self, index: MemoryIndex) -> &mut Memory {
+        if let Some(defined_index) = self.module().defined_memory_index(index) {
+            unsafe { &mut *self.get_defined_memory(defined_index) }
+        } else {
+            let import = self.imported_memory(index);
+            let ctx = unsafe { &mut *import.vmctx };
+            unsafe { &mut *ctx.instance_mut().get_defined_memory(import.index) }
+        }
+    }
+
     /// Return the indexed `VMMemoryDefinition`.
     fn memory(&self, index: DefinedMemoryIndex) -> VMMemoryDefinition {
         unsafe { VMMemoryDefinition::load(self.memory_ptr(index)) }