X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/26e182fc3ae2a40dc7d52bab2318d8d1837dfeee..HEAD:/symm/rijndael.c

diff --git a/symm/rijndael.c b/symm/rijndael.c
index 4c8837d2..597ae98f 100644
--- a/symm/rijndael.c
+++ b/symm/rijndael.c
@@ -34,6 +34,11 @@
 
 #include <mLib/bits.h>
 
+#if defined(TEST_RIG) && defined(ENABLE_ASM_DEBUG)
+#  include "regdump.h"
+#  define BLKC_TESTHOOK do { regdump_init(); } while (0)
+#endif
+
 #include "blkc.h"
 #include "dispatch.h"
 #include "gcipher.h"
@@ -83,15 +88,24 @@ CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_dblk,
 #if CPUFAM_X86 || CPUFAM_AMD64
 extern rijndael_eblk__functype rijndael_eblk_x86ish_aesni;
 extern rijndael_dblk__functype rijndael_dblk_x86ish_aesni;
+extern rijndael_eblk__functype rijndael_eblk_x86ish_aesni_avx;
+extern rijndael_dblk__functype rijndael_dblk_x86ish_aesni_avx;
 #endif
 #if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
 extern rijndael_eblk__functype rijndael_eblk_arm_crypto;
 extern rijndael_dblk__functype rijndael_dblk_arm_crypto;
 #endif
+#if CPUFAM_ARM64
+extern rijndael_eblk__functype rijndael_eblk_arm64_crypto;
+extern rijndael_dblk__functype rijndael_dblk_arm64_crypto;
+#endif
 
 static rijndael_eblk__functype *pick_eblk(void)
 {
 #if CPUFAM_X86 || CPUFAM_AMD64
+  DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_x86ish_aesni_avx,
+		     cpu_feature_p(CPUFEAT_X86_AVX) &&
+		     cpu_feature_p(CPUFEAT_X86_AESNI));
   DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_x86ish_aesni,
 		     cpu_feature_p(CPUFEAT_X86_AESNI));
 #endif
@@ -99,12 +113,19 @@ static rijndael_eblk__functype *pick_eblk(void)
   DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_arm_crypto,
 		     cpu_feature_p(CPUFEAT_ARM_AES));
 #endif
+#if CPUFAM_ARM64
+  DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_arm64_crypto,
+		     cpu_feature_p(CPUFEAT_ARM_AES));
+#endif
   DISPATCH_PICK_FALLBACK(rijndael_eblk, simple_eblk);
 }
 
 static rijndael_dblk__functype *pick_dblk(void)
 {
 #if CPUFAM_X86 || CPUFAM_AMD64
+  DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_x86ish_aesni_avx,
+		     cpu_feature_p(CPUFEAT_X86_AVX) &&
+		     cpu_feature_p(CPUFEAT_X86_AESNI));
   DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_x86ish_aesni,
 		     cpu_feature_p(CPUFEAT_X86_AESNI));
 #endif
@@ -112,6 +133,10 @@ static rijndael_dblk__functype *pick_dblk(void)
   DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_arm_crypto,
 		     cpu_feature_p(CPUFEAT_ARM_AES));
 #endif
+#if CPUFAM_ARM64
+  DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_arm64_crypto,
+		     cpu_feature_p(CPUFEAT_ARM_AES));
+#endif
   DISPATCH_PICK_FALLBACK(rijndael_dblk, simple_dblk);
 }