Merge pull request #173 from alexcrichton/merge

Merge upstream/main

Author: alexcrichton

Cargo.lock

@@ -88,7 +88,7 @@ http = { workspace = true, optional = true }
 http-body-util = { workspace = true, optional = true }
 
 [target.'cfg(unix)'.dependencies]
-rustix = { workspace = true, features = ["mm", "param", "process"] }
+rustix = { workspace = true, features = ["mm", "process"] }
 
 [dev-dependencies]
 # depend again on wasmtime to activate its default features for tests
@@ -134,6 +134,9 @@ futures = { workspace = true }
 [target.'cfg(windows)'.dev-dependencies]
 windows-sys = { workspace = true, features = ["Win32_System_Memory"] }
 
+[target.'cfg(unix)'.dev-dependencies]
+rustix = { workspace = true, features = ["param"] }
+
 [build-dependencies]
 anyhow = { workspace = true, features = ['std'] }
 
@@ -206,10 +209,12 @@ map_clone = 'warn'
 uninlined_format_args = 'warn'
 unnecessary_to_owned = 'warn'
 manual_strip = 'warn'
+useless_conversion = 'warn'
 unnecessary_mut_passed = 'warn'
 unnecessary_fallible_conversions = 'warn'
 unnecessary_cast = 'warn'
 allow_attributes_without_reason = 'warn'
+from_over_into = 'warn'
 
 [workspace.dependencies]
 arbitrary = { version = "1.4.0" }

Cargo.toml

@@ -12,7 +12,6 @@ fn measure_execution_time(c: &mut Criterion) {
         let (engine, module) = test_setup();
         b.iter_custom(move |iters| {
             (0..iters)
-                .into_iter()
                 .map(|_| lazy_thread_instantiate(engine.clone(), module.clone()))
                 .sum()
         })
@@ -24,7 +23,6 @@ fn measure_execution_time(c: &mut Criterion) {
         let (engine, module) = test_setup();
         b.iter_custom(move |iters| {
             (0..iters)
-                .into_iter()
                 .map(|_| {
                     let (init, _call) = eager_thread_instantiate(engine.clone(), module.clone());
                     init
@@ -39,7 +37,6 @@ fn measure_execution_time(c: &mut Criterion) {
         let (engine, module) = test_setup();
         b.iter_custom(move |iters| {
             (0..iters)
-                .into_iter()
                 .map(|_| {
                     let (_init, call) = eager_thread_instantiate(engine.clone(), module.clone());
                     call

benches/thread_eager_init.rs

@@ -9,9 +9,9 @@ mod features;
 pub mod format;
 
 pub use encoding::{
-    Encoding, Group1Prefix, Group2Prefix, Group3Prefix, Group4Prefix, Opcodes, Prefixes, Rex,
+    Encoding, Group1Prefix, Group2Prefix, Group3Prefix, Group4Prefix, Opcodes, Prefixes, Rex, Vex,
+    VexLength, VexMMMMM, VexPP, rex, vex,
 };
-pub use encoding::{rex, vex};
 pub use features::{ALL_FEATURES, Feature, Features};
 pub use format::{Extension, Format, Location, Mutability, Operand, OperandKind, RegClass};
 pub use format::{align, fmt, implicit, r, rw, sxl, sxq, sxw, w};
@@ -30,6 +30,7 @@ pub fn inst(
         format,
         encoding,
         features: features.into(),
+        has_trap: false,
     }
 }
 
@@ -56,6 +57,9 @@ pub struct Inst {
     /// "64-bit/32-bit Mode Support" and "CPUID Feature Flag" columns of the x64
     /// reference manual.
     pub features: Features,
+    /// Whether or not this instruction can trap and thus needs a `TrapCode`
+    /// payload in the instruction itself.
+    pub has_trap: bool,
 }
 
 impl Inst {
@@ -77,6 +81,13 @@ impl Inst {
             self.format.name.to_lowercase()
         )
     }
+
+    /// Flags this instruction as being able to trap, so needs a `TrapCode` at
+    /// compile time to track this.
+    pub fn has_trap(mut self) -> Self {
+        self.has_trap = true;
+        self
+    }
 }
 
 impl core::fmt::Display for Inst {
@@ -86,11 +97,15 @@ impl core::fmt::Display for Inst {
             format,
             encoding,
             features,
+            has_trap,
         } = self;
         write!(f, "{name}: {format} => {encoding}")?;
         if !features.is_empty() {
             write!(f, " [{features}]")?;
         }
+        if *has_trap {
+            write!(f, " has_trap")?;
+        }
         Ok(())
     }
 }