From 2ed2e19e8e2f926dbea974c08ec9692536f7b24d Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Tue, 25 May 2021 20:41:09 -0400
Subject: Remove unneeded <arm_acle.h> include

---
 TestPrograms/test_arm_aes.cpp    |  3 ---
 TestPrograms/test_arm_asimd.cpp  |  3 ---
 TestPrograms/test_arm_crc.cpp    | 48 +---------------------------------------
 TestPrograms/test_arm_sha1.cpp   |  3 ---
 TestPrograms/test_arm_sha256.cpp |  3 ---
 TestPrograms/test_arm_sha3.cpp   | 38 ++-----------------------------
 6 files changed, 3 insertions(+), 95 deletions(-)

(limited to 'TestPrograms')

diff --git a/TestPrograms/test_arm_aes.cpp b/TestPrograms/test_arm_aes.cpp
index f9795327..c07a311c 100644
--- a/TestPrograms/test_arm_aes.cpp
+++ b/TestPrograms/test_arm_aes.cpp
@@ -2,9 +2,6 @@
 #ifdef CRYPTOPP_ARM_NEON_HEADER
 # include <arm_neon.h>
 #endif
-#ifdef CRYPTOPP_ARM_ACLE_HEADER
-# include <arm_acle.h>
-#endif
 
 int main(int argc, char* argv[])
 {
diff --git a/TestPrograms/test_arm_asimd.cpp b/TestPrograms/test_arm_asimd.cpp
index a83e73b8..edb627af 100644
--- a/TestPrograms/test_arm_asimd.cpp
+++ b/TestPrograms/test_arm_asimd.cpp
@@ -2,9 +2,6 @@
 #ifdef CRYPTOPP_ARM_NEON_HEADER
 # include <arm_neon.h>
 #endif
-#ifdef CRYPTOPP_ARM_ACLE_HEADER
-# include <arm_acle.h>
-#endif
 
 int main(int argc, char* argv[])
 {
diff --git a/TestPrograms/test_arm_crc.cpp b/TestPrograms/test_arm_crc.cpp
index 2fae855b..279ca6a7 100644
--- a/TestPrograms/test_arm_crc.cpp
+++ b/TestPrograms/test_arm_crc.cpp
@@ -8,53 +8,7 @@
 #endif
 
 // Keep sync'd with arm_simd.h
-inline uint32_t CRC32B (uint32_t crc, uint8_t val)
-{
-#if defined(_MSC_VER)
-	return __crc32b(crc, val);
-#else
-    uint32_t r;
-    __asm__ ("crc32b    %w0, %w1, %w2   \n\t"
-            :"=r" (r) : "r" (crc), "r" (val) );
-    return r;
-#endif
-}
-
-inline uint32_t CRC32W (uint32_t crc, uint32_t val)
-{
-#if defined(_MSC_VER)
-	return __crc32w(crc, val);
-#else
-    uint32_t r;
-    __asm__ ("crc32w    %w0, %w1, %w2   \n\t"
-            :"=r" (r) : "r" (crc), "r" (val) );
-    return r;
-#endif
-}
-
-inline uint32_t CRC32CB (uint32_t crc, uint8_t val)
-{
-#if defined(_MSC_VER)
-	return __crc32cb(crc, val);
-#else
-    uint32_t r;
-    __asm__ ("crc32cb    %w0, %w1, %w2   \n\t"
-            :"=r" (r) : "r" (crc), "r" (val) );
-    return r;
-#endif
-}
-
-inline uint32_t CRC32CW (uint32_t crc, uint32_t val)
-{
-#if defined(_MSC_VER)
-	return __crc32cw(crc, val);
-#else
-    uint32_t r;
-    __asm__ ("crc32cw    %w0, %w1, %w2   \n\t"
-            :"=r" (r) : "r" (crc), "r" (val) );
-    return r;
-#endif
-}
+#include "../arm_simd.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/TestPrograms/test_arm_sha1.cpp b/TestPrograms/test_arm_sha1.cpp
index 4a247d4d..d3d4e2e0 100644
--- a/TestPrograms/test_arm_sha1.cpp
+++ b/TestPrograms/test_arm_sha1.cpp
@@ -2,9 +2,6 @@
 #ifdef CRYPTOPP_ARM_NEON_HEADER
 # include <arm_neon.h>
 #endif
-#ifdef CRYPTOPP_ARM_ACLE_HEADER
-# include <arm_acle.h>
-#endif
 
 int main(int argc, char* argv[])
 {
diff --git a/TestPrograms/test_arm_sha256.cpp b/TestPrograms/test_arm_sha256.cpp
index 75bb5694..3db20a04 100644
--- a/TestPrograms/test_arm_sha256.cpp
+++ b/TestPrograms/test_arm_sha256.cpp
@@ -2,9 +2,6 @@
 #ifdef CRYPTOPP_ARM_NEON_HEADER
 # include <arm_neon.h>
 #endif
-#ifdef CRYPTOPP_ARM_ACLE_HEADER
-# include <arm_acle.h>
-#endif
 
 int main(int argc, char* argv[])
 {
diff --git a/TestPrograms/test_arm_sha3.cpp b/TestPrograms/test_arm_sha3.cpp
index d60e0602..afcbab8b 100644
--- a/TestPrograms/test_arm_sha3.cpp
+++ b/TestPrograms/test_arm_sha3.cpp
@@ -3,42 +3,8 @@
 # include <arm_neon.h>
 #endif
 
-inline uint64x2_t VEOR3(uint64x2_t a, uint64x2_t b, uint64x2_t c)
-{
-#if defined(_MSC_VER)
-    return veor3q_u64(a, b, c);
-#else
-    uint64x2_t r;
-    __asm__ ("eor3   %0.16b, %1.16b, %2.16b, %3.16b   \n\t"
-            :"=w" (r) : "w" (a), "w" (b), "w" (c));
-    return r;
-#endif
-}
-
-template <unsigned int C>
-inline uint64x2_t VXAR(uint64x2_t a, uint64x2_t b)
-{
-#if defined(_MSC_VER)
-    return vxarq_u64(a, b, C);
-#else
-    uint64x2_t r;
-    __asm__ ("xar   %0.2d, %1.2d, %2.2d, %3   \n\t"
-            :"=w" (r) : "w" (a), "w" (b), "I" (C));
-    return r;
-#endif
-}
-
-inline uint64x2_t VRAX1(uint64x2_t a, uint64x2_t b)
-{
-#if defined(_MSC_VER)
-    return vrax1q_u64(a, b);
-#else
-    uint64x2_t r;
-    __asm__ ("rax1   %0.2d, %1.2d, %2.2d   \n\t"
-            :"=w" (r) : "w" (a), "w" (b));
-    return r;
-#endif
-}
+// Keep sync'd with arm_simd.h
+#include "../arm_simd.h"
 
 int main(int argc, char* argv[])
 {
-- 
cgit v1.2.1