Implement translation and execution of some SIMD load instructions

crates/core/src/simd.rs

@@ -1519,7 +1519,7 @@ macro_rules! impl_v128_loadN_splat_at_for {
             ///
             /// If `address` loads out of bounds from `memory`.
             pub fn $name(memory: &[u8], address: usize) -> Result<V128, TrapCode> {
-                memory::load_at::<u8>(memory, address).map(V128::splat)
+                memory::load_at::<$ty>(memory, address).map(V128::splat)
             }
         )*
     };

crates/wasmi/src/engine/executor/instrs.rs

@@ -2074,125 +2074,173 @@
                     offset,
                 } => self.execute_v128_load_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load32Zero { result, offset_lo } => todo!(),
+                Instr::V128Load32Zero { result, offset_lo } => {
+                    self.execute_v128_load32_zero(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load32ZeroAt { result, address } => todo!(),
+                Instr::V128Load32ZeroAt { result, address } => {
+                    self.execute_v128_load32_zero_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load32ZeroOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load32_zero_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load64Zero { result, offset_lo } => todo!(),
+                Instr::V128Load64Zero { result, offset_lo } => {
+                    self.execute_v128_load64_zero(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load64ZeroAt { result, address } => todo!(),
+                Instr::V128Load64ZeroAt { result, address } => {
+                    self.execute_v128_load64_zero_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load64ZeroOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load64_zero_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load8Splat { result, offset_lo } => todo!(),
+                Instr::V128Load8Splat { result, offset_lo } => {
+                    self.execute_v128_load8_splat(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load8SplatAt { result, address } => todo!(),
+                Instr::V128Load8SplatAt { result, address } => {
+                    self.execute_v128_load8_splat_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load8SplatOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load8_splat_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load16Splat { result, offset_lo } => todo!(),
+                Instr::V128Load16Splat { result, offset_lo } => {
+                    self.execute_v128_load16_splat(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load16SplatAt { result, address } => todo!(),
+                Instr::V128Load16SplatAt { result, address } => {
+                    self.execute_v128_load16_splat_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load16SplatOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load16_splat_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load32Splat { result, offset_lo } => todo!(),
+                Instr::V128Load32Splat { result, offset_lo } => {
+                    self.execute_v128_load32_splat(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load32SplatAt { result, address } => todo!(),
+                Instr::V128Load32SplatAt { result, address } => {
+                    self.execute_v128_load32_splat_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load32SplatOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load32_splat_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load64Splat { result, offset_lo } => todo!(),
+                Instr::V128Load64Splat { result, offset_lo } => {
+                    self.execute_v128_load64_splat(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load64SplatAt { result, address } => todo!(),
+                Instr::V128Load64SplatAt { result, address } => {
+                    self.execute_v128_load64_splat_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load64SplatOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load64_splat_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load8x8S { result, offset_lo } => todo!(),
+                Instr::V128Load8x8S { result, offset_lo } => {
+                    self.execute_v128_load8x8_s(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load8x8SAt { result, address } => todo!(),
+                Instr::V128Load8x8SAt { result, address } => {
+                    self.execute_v128_load8x8_s_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load8x8SOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load8x8_s_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load8x8U { result, offset_lo } => todo!(),
+                Instr::V128Load8x8U { result, offset_lo } => {
+                    self.execute_v128_load8x8_u(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load8x8UAt { result, address } => todo!(),
+                Instr::V128Load8x8UAt { result, address } => {
+                    self.execute_v128_load8x8_u_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load8x8UOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load8x8_u_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load16x4S { result, offset_lo } => todo!(),
+                Instr::V128Load16x4S { result, offset_lo } => {
+                    self.execute_v128_load16x4_s(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load16x4SAt { result, address } => todo!(),
+                Instr::V128Load16x4SAt { result, address } => {
+                    self.execute_v128_load16x4_s_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load16x4SOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load16x4_s_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load16x4U { result, offset_lo } => todo!(),
+                Instr::V128Load16x4U { result, offset_lo } => {
+                    self.execute_v128_load16x4_u(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load16x4UAt { result, address } => todo!(),
+                Instr::V128Load16x4UAt { result, address } => {
+                    self.execute_v128_load16x4_u_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load16x4UOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load16x4_u_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load32x2S { result, offset_lo } => todo!(),
+                Instr::V128Load32x2S { result, offset_lo } => {
+                    self.execute_v128_load32x2_s(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load32x2SAt { result, address } => todo!(),
+                Instr::V128Load32x2SAt { result, address } => {
+                    self.execute_v128_load32x2_s_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load32x2SOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load32x2_s_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
-                Instr::V128Load32x2U { result, offset_lo } => todo!(),
+                Instr::V128Load32x2U { result, offset_lo } => {
+                    self.execute_v128_load32x2_u(&store.inner, result, offset_lo)?
+                }
                 #[cfg(feature = "simd")]
-                Instr::V128Load32x2UAt { result, address } => todo!(),
+                Instr::V128Load32x2UAt { result, address } => {
+                    self.execute_v128_load32x2_u_at(&store.inner, result, address)?
+                }
                 #[cfg(feature = "simd")]
                 Instr::V128Load32x2UOffset16 {
                     result,
                     ptr,
                     offset,
-                } => todo!(),
+                } => self.execute_v128_load32x2_u_offset16(result, ptr, offset)?,
                 #[cfg(feature = "simd")]
                 Instr::V128Load8Lane { result, offset_lo } => todo!(),
                 #[cfg(feature = "simd")]

crates/wasmi/src/engine/executor/instrs/load.rs

@@ -247,6 +247,102 @@ impl Executor<'_> {
             simd::v128_load,
             simd::v128_load_at,
         ),
+        (
+            V128,
+            (Instruction::V128Load8x8S, execute_v128_load8x8_s),
+            (Instruction::V128Load8x8SAt, execute_v128_load8x8_s_at),
+            (Instruction::V128Load8x8SOffset16, execute_v128_load8x8_s_offset16),
+            simd::v128_load8x8_s,
+            simd::v128_load8x8_s_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load8x8U, execute_v128_load8x8_u),
+            (Instruction::V128Load8x8UAt, execute_v128_load8x8_u_at),
+            (Instruction::V128Load8x8UOffset16, execute_v128_load8x8_u_offset16),
+            simd::v128_load8x8_u,
+            simd::v128_load8x8_u_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load16x4S, execute_v128_load16x4_s),
+            (Instruction::V128Load16x4SAt, execute_v128_load16x4_s_at),
+            (Instruction::V128Load16x4SOffset16, execute_v128_load16x4_s_offset16),
+            simd::v128_load16x4_s,
+            simd::v128_load16x4_s_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load16x4U, execute_v128_load16x4_u),
+            (Instruction::V128Load16x4UAt, execute_v128_load16x4_u_at),
+            (Instruction::V128Load16x4UOffset16, execute_v128_load16x4_u_offset16),
+            simd::v128_load16x4_u,
+            simd::v128_load16x4_u_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load32x2S, execute_v128_load32x2_s),
+            (Instruction::V128Load32x2SAt, execute_v128_load32x2_s_at),
+            (Instruction::V128Load32x2SOffset16, execute_v128_load32x2_s_offset16),
+            simd::v128_load32x2_s,
+            simd::v128_load32x2_s_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load32x2U, execute_v128_load32x2_u),
+            (Instruction::V128Load32x2UAt, execute_v128_load32x2_u_at),
+            (Instruction::V128Load32x2UOffset16, execute_v128_load32x2_u_offset16),
+            simd::v128_load32x2_u,
+            simd::v128_load32x2_u_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load8Splat, execute_v128_load8_splat),
+            (Instruction::V128Load8SplatAt, execute_v128_load8_splat_at),
+            (Instruction::V128Load8SplatOffset16, execute_v128_load8_splat_offset16),
+            simd::v128_load8_splat,
+            simd::v128_load8_splat_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load16Splat, execute_v128_load16_splat),
+            (Instruction::V128Load16SplatAt, execute_v128_load16_splat_at),
+            (Instruction::V128Load16SplatOffset16, execute_v128_load16_splat_offset16),
+            simd::v128_load16_splat,
+            simd::v128_load16_splat_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load32Splat, execute_v128_load32_splat),
+            (Instruction::V128Load32SplatAt, execute_v128_load32_splat_at),
+            (Instruction::V128Load32SplatOffset16, execute_v128_load32_splat_offset16),
+            simd::v128_load32_splat,
+            simd::v128_load32_splat_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load64Splat, execute_v128_load64_splat),
+            (Instruction::V128Load64SplatAt, execute_v128_load64_splat_at),
+            (Instruction::V128Load64SplatOffset16, execute_v128_load64_splat_offset16),
+            simd::v128_load64_splat,
+            simd::v128_load64_splat_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load32Zero, execute_v128_load32_zero),
+            (Instruction::V128Load32ZeroAt, execute_v128_load32_zero_at),
+            (Instruction::V128Load32ZeroOffset16, execute_v128_load32_zero_offset16),
+            simd::v128_load32_zero,
+            simd::v128_load32_zero_at,
+        ),
+        (
+            V128,
+            (Instruction::V128Load64Zero, execute_v128_load64_zero),
+            (Instruction::V128Load64ZeroAt, execute_v128_load64_zero_at),
+            (Instruction::V128Load64ZeroOffset16, execute_v128_load64_zero_offset16),
+            simd::v128_load64_zero,
+            simd::v128_load64_zero_at,
+        ),
     }
 
     impl_execute_load! {