Merge pull request #195 from alexcrichton/merge

Another merge with main

Author: alexcrichton

Cargo.lock

@@ -174,7 +174,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "34.0.0"
+version = "35.0.0"
 authors = ["The Wasmtime Project Developers"]
 edition = "2024"
 # Wasmtime's current policy is that this number can be no larger than the
@@ -218,66 +218,67 @@ from_over_into = 'warn'
 
 [workspace.dependencies]
 arbitrary = { version = "1.4.0" }
-wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=34.0.0" }
-wasmtime = { path = "crates/wasmtime", version = "34.0.0", default-features = false }
-wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=34.0.0" }
-wasmtime-cache = { path = "crates/cache", version = "=34.0.0" }
-wasmtime-cli-flags = { path = "crates/cli-flags", version = "=34.0.0" }
-wasmtime-cranelift = { path = "crates/cranelift", version = "=34.0.0" }
-wasmtime-winch = { path = "crates/winch", version = "=34.0.0" }
-wasmtime-environ = { path = "crates/environ", version = "=34.0.0" }
-wasmtime-explorer = { path = "crates/explorer", version = "=34.0.0" }
-wasmtime-fiber = { path = "crates/fiber", version = "=34.0.0" }
-wasmtime-jit-debug = { path = "crates/jit-debug", version = "=34.0.0" }
-wasmtime-wast = { path = "crates/wast", version = "=34.0.0" }
-wasmtime-wasi = { path = "crates/wasi", version = "34.0.0", default-features = false }
-wasmtime-wasi-io = { path = "crates/wasi-io", version = "34.0.0", default-features = false }
-wasmtime-wasi-http = { path = "crates/wasi-http", version = "34.0.0", default-features = false }
-wasmtime-wasi-nn = { path = "crates/wasi-nn", version = "34.0.0" }
-wasmtime-wasi-config = { path = "crates/wasi-config", version = "34.0.0" }
-wasmtime-wasi-keyvalue = { path = "crates/wasi-keyvalue", version = "34.0.0" }
-wasmtime-wasi-threads = { path = "crates/wasi-threads", version = "34.0.0" }
-wasmtime-component-util = { path = "crates/component-util", version = "=34.0.0" }
-wasmtime-component-macro = { path = "crates/component-macro", version = "=34.0.0" }
-wasmtime-asm-macros = { path = "crates/asm-macros", version = "=34.0.0" }
-wasmtime-versioned-export-macros = { path = "crates/versioned-export-macros", version = "=34.0.0" }
-wasmtime-slab = { path = "crates/slab", version = "=34.0.0" }
-wasmtime-wasi-tls = { path = "crates/wasi-tls", version = "34.0.0" }
-wiggle = { path = "crates/wiggle", version = "=34.0.0", default-features = false }
-wiggle-macro = { path = "crates/wiggle/macro", version = "=34.0.0" }
-wiggle-generate = { path = "crates/wiggle/generate", version = "=34.0.0" }
-wasi-common = { path = "crates/wasi-common", version = "=34.0.0", default-features = false }
+wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=35.0.0" }
+wasmtime = { path = "crates/wasmtime", version = "35.0.0", default-features = false }
+wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=35.0.0" }
+wasmtime-cache = { path = "crates/cache", version = "=35.0.0" }
+wasmtime-cli-flags = { path = "crates/cli-flags", version = "=35.0.0" }
+wasmtime-cranelift = { path = "crates/cranelift", version = "=35.0.0" }
+wasmtime-winch = { path = "crates/winch", version = "=35.0.0" }
+wasmtime-environ = { path = "crates/environ", version = "=35.0.0" }
+wasmtime-explorer = { path = "crates/explorer", version = "=35.0.0" }
+wasmtime-fiber = { path = "crates/fiber", version = "=35.0.0" }
+wasmtime-jit-debug = { path = "crates/jit-debug", version = "=35.0.0" }
+wasmtime-wast = { path = "crates/wast", version = "=35.0.0" }
+wasmtime-wasi = { path = "crates/wasi", version = "35.0.0", default-features = false }
+wasmtime-wasi-io = { path = "crates/wasi-io", version = "35.0.0", default-features = false }
+wasmtime-wasi-http = { path = "crates/wasi-http", version = "35.0.0", default-features = false }
+wasmtime-wasi-nn = { path = "crates/wasi-nn", version = "35.0.0" }
+wasmtime-wasi-config = { path = "crates/wasi-config", version = "35.0.0" }
+wasmtime-wasi-keyvalue = { path = "crates/wasi-keyvalue", version = "35.0.0" }
+wasmtime-wasi-threads = { path = "crates/wasi-threads", version = "35.0.0" }
+wasmtime-component-util = { path = "crates/component-util", version = "=35.0.0" }
+wasmtime-component-macro = { path = "crates/component-macro", version = "=35.0.0" }
+wasmtime-asm-macros = { path = "crates/asm-macros", version = "=35.0.0" }
+wasmtime-versioned-export-macros = { path = "crates/versioned-export-macros", version = "=35.0.0" }
+wasmtime-slab = { path = "crates/slab", version = "=35.0.0" }
+wasmtime-wasi-tls = { path = "crates/wasi-tls", version = "35.0.0" }
+wiggle = { path = "crates/wiggle", version = "=35.0.0", default-features = false }
+wiggle-macro = { path = "crates/wiggle/macro", version = "=35.0.0" }
+wiggle-generate = { path = "crates/wiggle/generate", version = "=35.0.0" }
+wasi-common = { path = "crates/wasi-common", version = "=35.0.0", default-features = false }
 wasmtime-fuzzing = { path = "crates/fuzzing" }
-wasmtime-jit-icache-coherence = { path = "crates/jit-icache-coherence", version = "=34.0.0" }
-wasmtime-wit-bindgen = { path = "crates/wit-bindgen", version = "=34.0.0" }
-wasmtime-math = { path = "crates/math", version = "=34.0.0" }
+wasmtime-jit-icache-coherence = { path = "crates/jit-icache-coherence", version = "=35.0.0" }
+wasmtime-wit-bindgen = { path = "crates/wit-bindgen", version = "=35.0.0" }
+wasmtime-math = { path = "crates/math", version = "=35.0.0" }
+wasmtime-unwinder = { path = "crates/unwinder", version = "=35.0.0" }
 test-programs-artifacts = { path = 'crates/test-programs/artifacts' }
 wasmtime-test-util = { path = "crates/test-util" }
 component-async-tests = { path = "crates/misc/component-async-tests" }
 
-pulley-interpreter = { path = 'pulley', version = "=34.0.0" }
+pulley-interpreter = { path = 'pulley', version = "=35.0.0" }
 pulley-interpreter-fuzz = { path = 'pulley/fuzz' }
-pulley-macros = { path = 'pulley/macros', version = "=34.0.0" }
-
-cranelift-assembler-x64 = { path = "cranelift/assembler-x64", version = "0.121.0" }
-cranelift-codegen = { path = "cranelift/codegen", version = "0.121.0", default-features = false, features = ["std", "unwind"] }
-cranelift-frontend = { path = "cranelift/frontend", version = "0.121.0" }
-cranelift-entity = { path = "cranelift/entity", version = "0.121.0" }
-cranelift-native = { path = "cranelift/native", version = "0.121.0" }
-cranelift-module = { path = "cranelift/module", version = "0.121.0" }
-cranelift-interpreter = { path = "cranelift/interpreter", version = "0.121.0" }
-cranelift-reader = { path = "cranelift/reader", version = "0.121.0" }
+pulley-macros = { path = 'pulley/macros', version = "=35.0.0" }
+
+cranelift-assembler-x64 = { path = "cranelift/assembler-x64", version = "0.122.0" }
+cranelift-codegen = { path = "cranelift/codegen", version = "0.122.0", default-features = false, features = ["std", "unwind"] }
+cranelift-frontend = { path = "cranelift/frontend", version = "0.122.0" }
+cranelift-entity = { path = "cranelift/entity", version = "0.122.0" }
+cranelift-native = { path = "cranelift/native", version = "0.122.0" }
+cranelift-module = { path = "cranelift/module", version = "0.122.0" }
+cranelift-interpreter = { path = "cranelift/interpreter", version = "0.122.0" }
+cranelift-reader = { path = "cranelift/reader", version = "0.122.0" }
 cranelift-filetests = { path = "cranelift/filetests" }
-cranelift-object = { path = "cranelift/object", version = "0.121.0" }
-cranelift-jit = { path = "cranelift/jit", version = "0.121.0" }
+cranelift-object = { path = "cranelift/object", version = "0.122.0" }
+cranelift-jit = { path = "cranelift/jit", version = "0.122.0" }
 cranelift-fuzzgen = { path = "cranelift/fuzzgen" }
-cranelift-bforest = { path = "cranelift/bforest", version = "0.121.0" }
-cranelift-bitset = { path = "cranelift/bitset", version = "0.121.0" }
-cranelift-control = { path = "cranelift/control", version = "0.121.0" }
-cranelift-srcgen = { path = "cranelift/srcgen", version = "0.121.0" }
-cranelift = { path = "cranelift/umbrella", version = "0.121.0" }
+cranelift-bforest = { path = "cranelift/bforest", version = "0.122.0" }
+cranelift-bitset = { path = "cranelift/bitset", version = "0.122.0" }
+cranelift-control = { path = "cranelift/control", version = "0.122.0" }
+cranelift-srcgen = { path = "cranelift/srcgen", version = "0.122.0" }
+cranelift = { path = "cranelift/umbrella", version = "0.122.0" }
 
-winch-codegen = { path = "winch/codegen", version = "=34.0.0" }
+winch-codegen = { path = "winch/codegen", version = "=35.0.0" }
 
 wasi-preview1-component-adapter = { path = "crates/wasi-preview1-component-adapter" }
 byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-array-literals" }

Cargo.toml

@@ -1,4 +1,4 @@
-## 34.0.0
+## 35.0.0
 
 Unreleased.
 
@@ -12,6 +12,7 @@ Release notes for previous releases of Wasmtime can be found on the respective
 release branches of the Wasmtime repository.
 
 <!-- ARCHIVE_START -->
+* [34.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-34.0.0/RELEASES.md)
 * [33.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-33.0.0/RELEASES.md)
 * [32.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-32.0.0/RELEASES.md)
 * [31.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-31.0.0/RELEASES.md)

RELEASES.md

@@ -1,7 +1,7 @@
 [package]
 name = "cranelift-assembler-x64"
 description = "A Cranelift-specific x64 assembler"
-version = "0.121.0"
+version = "0.122.0"
 license = "Apache-2.0 WITH LLVM-exception"
 edition.workspace = true
 rust-version.workspace = true
@@ -16,7 +16,7 @@ arbtest = "0.3.1"
 capstone = { workspace = true }
 
 [build-dependencies]
-cranelift-assembler-x64-meta = { path = "meta", version = "0.121.0" }
+cranelift-assembler-x64-meta = { path = "meta", version = "0.122.0" }
 
 [lints]
 workspace = true

cranelift/assembler-x64/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cranelift-assembler-x64-meta"
 description = "Generate a Cranelift-specific assembler for x64 instructions"
-version = "0.121.0"
+version = "0.122.0"
 license = "Apache-2.0 WITH LLVM-exception"
 edition.workspace = true
 rust-version.workspace = true

cranelift/assembler-x64/meta/Cargo.toml

@@ -4,10 +4,12 @@
 //! - compact--i.e., define an x64 instruction on a single line, and
 //! - a close-to-direct mapping of what we read in the x64 reference manual.
 
+mod custom;
 mod encoding;
 mod features;
 pub mod format;
 
+pub use custom::{Custom, CustomOperation};
 pub use encoding::{Encoding, ModRmKind, OpcodeMod};
 pub use encoding::{
     Group1Prefix, Group2Prefix, Group3Prefix, Group4Prefix, Opcodes, Prefixes, Rex, rex,
@@ -32,7 +34,7 @@ pub fn inst(
         encoding,
         features: features.into(),
         has_trap: false,
-        custom_visit: false,
+        custom: Custom::default(),
     }
 }
 
@@ -62,9 +64,9 @@ pub struct Inst {
     /// Whether or not this instruction can trap and thus needs a `TrapCode`
     /// payload in the instruction itself.
     pub has_trap: bool,
-    /// Whether or not this instruction has a custom visit function for register
-    /// allocation.
-    pub custom_visit: bool,
+    /// Whether or not this instruction uses custom, external functions
+    /// instead of Rust code generated by this crate.
+    pub custom: Custom,
 }
 
 impl Inst {
@@ -94,10 +96,9 @@ impl Inst {
         self
     }
 
-    /// Flags this instruction as having a custom visit function, skipping the
-    /// auto-generated one.
-    pub fn custom_visit(mut self) -> Self {
-        self.custom_visit = true;
+    /// Indicate this instruction as needing custom processing.
+    pub fn custom(mut self, custom: impl Into<Custom>) -> Self {
+        self.custom = custom.into();
         self
     }
 }
@@ -110,7 +111,7 @@ impl core::fmt::Display for Inst {
             encoding,
             features,
             has_trap,
-            custom_visit,
+            custom,
         } = self;
         write!(f, "{name}: {format} => {encoding}")?;
         if !features.is_empty() {
@@ -119,8 +120,8 @@ impl core::fmt::Display for Inst {
         if *has_trap {
             write!(f, " has_trap")?;
         }
-        if *custom_visit {
-            write!(f, " custom_visit")?;
+        if !custom.is_empty() {
+            write!(f, " custom({custom})")?;
         }
         Ok(())
     }

cranelift/assembler-x64/meta/src/dsl.rs

@@ -0,0 +1,73 @@
+use core::fmt;
+use std::ops::BitOr;
+
+#[derive(PartialEq, Debug)]
+pub enum CustomOperation {
+    Visit,
+    Display,
+    Encode,
+}
+
+impl fmt::Display for CustomOperation {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Debug::fmt(self, f)
+    }
+}
+
+impl BitOr for CustomOperation {
+    type Output = Custom;
+    fn bitor(self, rhs: Self) -> Self::Output {
+        assert_ne!(self, rhs, "duplicate custom operation: {self:?}");
+        Custom(vec![self, rhs])
+    }
+}
+
+impl BitOr<CustomOperation> for Custom {
+    type Output = Custom;
+    fn bitor(mut self, rhs: CustomOperation) -> Self::Output {
+        assert!(
+            !self.0.contains(&rhs),
+            "duplicate custom operation: {rhs:?}"
+        );
+        self.0.push(rhs);
+        self
+    }
+}
+
+#[derive(PartialEq, Default)]
+pub struct Custom(Vec<CustomOperation>);
+
+impl Custom {
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &CustomOperation> {
+        self.0.iter()
+    }
+
+    pub fn contains(&self, operation: CustomOperation) -> bool {
+        self.0.contains(&operation)
+    }
+}
+
+impl fmt::Display for Custom {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            self.0
+                .iter()
+                .map(ToString::to_string)
+                .collect::<Vec<_>>()
+                .join(" | ")
+        )
+    }
+}
+
+impl From<CustomOperation> for Custom {
+    fn from(operation: CustomOperation) -> Self {
+        Custom(vec![operation])
+    }
+}

cranelift/assembler-x64/meta/src/dsl/custom.rs

@@ -66,6 +66,7 @@ pub enum Feature {
     sse2,
     ssse3,
     sse41,
+    sse42,
     bmi1,
     bmi2,
     lzcnt,
@@ -87,6 +88,7 @@ pub const ALL_FEATURES: &[Feature] = &[
     Feature::sse2,
     Feature::ssse3,
     Feature::sse41,
+    Feature::sse42,
     Feature::bmi1,
     Feature::bmi2,
     Feature::lzcnt,