diff --git a/simd/src/arm/mod.rs b/simd/src/arm/mod.rs index e69c8640..9e9a8952 100644 --- a/simd/src/arm/mod.rs +++ b/simd/src/arm/mod.rs @@ -25,11 +25,11 @@ macro_rules! simd_shuffle2 { const IDX: [u32; 2] = $idx; } - simd_shuffle2($x, $y, ConstParam::<$($imm),+>::IDX) + simd_shuffle($x, $y, ConstParam::<$($imm),+>::IDX) }}; ($x:expr, $y:expr, $idx:expr $(,)?) => {{ const IDX: [u32; 2] = $idx; - simd_shuffle2($x, $y, IDX) + simd_shuffle($x, $y, IDX) }}; } @@ -40,11 +40,11 @@ macro_rules! simd_shuffle4 { const IDX: [u32; 4] = $idx; } - simd_shuffle4($x, $y, ConstParam::<$($imm),+>::IDX) + simd_shuffle($x, $y, ConstParam::<$($imm),+>::IDX) }}; ($x:expr, $y:expr, $idx:expr $(,)?) => {{ const IDX: [u32; 4] = $idx; - simd_shuffle4($x, $y, IDX) + simd_shuffle($x, $y, IDX) }}; } @@ -884,8 +884,7 @@ extern "platform-intrinsic" { fn simd_le(x: T, y: T) -> U; fn simd_lt(x: T, y: T) -> U; - fn simd_shuffle2(x: T, y: T, idx: [u32; 2]) -> U; - fn simd_shuffle4(x: T, y: T, idx: [u32; 4]) -> U; + fn simd_shuffle(x: T, y: T, idx: I) -> U; fn simd_cast(x: T) -> U; } diff --git a/simd/src/arm/swizzle_f32x4.rs b/simd/src/arm/swizzle_f32x4.rs index c46084ee..18b7a02d 100644 --- a/simd/src/arm/swizzle_f32x4.rs +++ b/simd/src/arm/swizzle_f32x4.rs @@ -17,11 +17,11 @@ macro_rules! simd_shuffle4 { const IDX: [u32; 4] = $idx; } - arm::simd_shuffle4($x, $y, ConstParam::<$($imm),+>::IDX) + arm::simd_shuffle($x, $y, ConstParam::<$($imm),+>::IDX) }}; ($x:expr, $y:expr, $idx:expr $(,)?) => {{ const IDX: [u32; 4] = $idx; - arm::simd_shuffle4($x, $y, IDX) + arm::simd_shuffle($x, $y, IDX) }}; } diff --git a/simd/src/arm/swizzle_i32x4.rs b/simd/src/arm/swizzle_i32x4.rs index de8d3973..05b1594a 100644 --- a/simd/src/arm/swizzle_i32x4.rs +++ b/simd/src/arm/swizzle_i32x4.rs @@ -17,11 +17,11 @@ macro_rules! simd_shuffle4 { const IDX: [u32; 4] = $idx; } - arm::simd_shuffle4($x, $y, ConstParam::<$($imm),+>::IDX) + arm::simd_shuffle($x, $y, ConstParam::<$($imm),+>::IDX) }}; ($x:expr, $y:expr, $idx:expr $(,)?) => {{ const IDX: [u32; 4] = $idx; - arm::simd_shuffle4($x, $y, IDX) + arm::simd_shuffle($x, $y, IDX) }}; }