Initialize the register dumping machinery while testing assembler code.

[catacomb] / symm / rijndael.c

diff --git a/symm/rijndael.c b/symm/rijndael.c
index dcb35e6..597ae98 100644 (file)
--- 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"
@@ -72,36 +77,66 @@ void rijndael_init(rijndael_ctx *k, const void *buf, size_t sz)
  * Use:                Low-level block encryption and decryption.
  */
 
-CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_eblk, (const rijndael_ctx *k,
-                                                const uint32 s[4],
-                                                uint32 d[4]),
+CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_eblk,
+            (const rijndael_ctx *k, const uint32 s[4], uint32 d[4]),
             (k, s, d), pick_eblk, simple_eblk)
 
-CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_dblk, (const rijndael_ctx *k,
-                                                const uint32 s[4],
-                                                uint32 d[4]),
+CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_dblk,
+            (const rijndael_ctx *k, const uint32 s[4], uint32 d[4]),
             (k, s, d), pick_dblk, simple_dblk)
 
-#ifdef CPUFAM_X86
-extern rijndael_eblk__functype rijndael_eblk_x86_aesni;
-extern rijndael_dblk__functype rijndael_dblk_x86_aesni;
+#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)
 {
-#ifdef CPUFAM_X86
-  DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_x86_aesni,
+#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
+#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
+  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)
 {
-#ifdef CPUFAM_X86
-  DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_x86_aesni,
+#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
+#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
+  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);
 }