From f984d8eef4208cff8d24a8aaca14b623834db386 Mon Sep 17 00:00:00 2001 From: Noah Stiltner Date: Fri, 7 Jun 2024 10:34:45 -0500 Subject: [PATCH] removed unused macro and unnecessary test --- chacha20/src/backends/neon.rs | 41 ----------------------------------- 1 file changed, 41 deletions(-) diff --git a/chacha20/src/backends/neon.rs b/chacha20/src/backends/neon.rs index a8350c7..e411a72 100644 --- a/chacha20/src/backends/neon.rs +++ b/chacha20/src/backends/neon.rs @@ -115,19 +115,6 @@ macro_rules! add_assign_vec { }; } -macro_rules! add_counter { - // macro definition for when V::USES_U32_COUNTER is true - ($a:expr, $b:literal, $uses_u32_counter:expr) => { - match $uses_u32_counter { - true => add64!($a, vld1q_u32([$b, 0, 0, 0].as_ptr())), - false => vreinterpretq_u32_u64(vaddq_u64( - vreinterpretq_u64_u32($a), - vld1q_u64([$b, 0].as_ptr()), - )), - } - }; -} - #[cfg(feature = "cipher")] impl StreamBackend for Backend { #[inline(always)] @@ -343,31 +330,3 @@ unsafe fn cols_to_rows(blocks: &mut [[uint32x4_t; 4]; 4]) { extract!(block[3], 1); } } - -#[cfg(test)] -mod tests { - use super::*; - - fn reg_to_arr(reg: uint32x4_t) -> [u32; 4] { - unsafe { - let result: [u32; 4] = core::mem::transmute_copy(®); - result - } - } - - #[test] - fn counter() { - unsafe { - let start: [u32; 4] = [0, 0, 0, 0]; - let mut reg = vld1q_u32(start.as_ptr()); - let one = vld1q_u32([1, 0, 0, 0].as_ptr()); - let result_add64 = add64!(reg, one); - assert_eq!(reg_to_arr(result_add64), [1, 0, 0, 0]); - - let max: [u32; 4] = [u32::MAX, 0, 0, 0]; - reg = vld1q_u32(max.as_ptr()); - let result_add64 = add64!(reg, one); - assert_eq!(reg_to_arr(result_add64), [0, 1, 0, 0]); - } - } -}