~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base/asm-common.h (x86), and knock-on: Add macros for full-size regs.
[catacomb]
/
symm
/
rijndael-base.c
diff --git
a/symm/rijndael-base.c
b/symm/rijndael-base.c
index
01f781d
..
2f65191
100644
(file)
--- a/
symm/rijndael-base.c
+++ b/
symm/rijndael-base.c
@@
-118,14
+118,21
@@
CPU_DISPATCH(static, EMPTY, void, setup,
#if CPUFAM_X86 || CPUFAM_AMD64
extern setup__functype rijndael_setup_x86ish_aesni;
#if CPUFAM_X86 || CPUFAM_AMD64
extern setup__functype rijndael_setup_x86ish_aesni;
+extern setup__functype rijndael_setup_x86ish_aesni_avx;
#endif
#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
extern setup__functype rijndael_setup_arm_crypto;
#endif
#endif
#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
extern setup__functype rijndael_setup_arm_crypto;
#endif
+#if CPUFAM_ARM64
+extern setup__functype rijndael_setup_arm64_crypto;
+#endif
static setup__functype *pick_setup(void)
{
#if CPUFAM_X86 || CPUFAM_AMD64
static setup__functype *pick_setup(void)
{
#if CPUFAM_X86 || CPUFAM_AMD64
+ DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86ish_aesni_avx,
+ cpu_feature_p(CPUFEAT_X86_AVX) &&
+ cpu_feature_p(CPUFEAT_X86_AESNI));
DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86ish_aesni,
cpu_feature_p(CPUFEAT_X86_AESNI));
#endif
DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86ish_aesni,
cpu_feature_p(CPUFEAT_X86_AESNI));
#endif
@@
-133,6
+140,10
@@
static setup__functype *pick_setup(void)
DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_arm_crypto,
cpu_feature_p(CPUFEAT_ARM_AES));
#endif
DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_arm_crypto,
cpu_feature_p(CPUFEAT_ARM_AES));
#endif
+#if CPUFAM_ARM64
+ DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_arm64_crypto,
+ cpu_feature_p(CPUFEAT_ARM_AES));
+#endif
DISPATCH_PICK_FALLBACK(rijndael_setup, simple_setup);
}
DISPATCH_PICK_FALLBACK(rijndael_setup, simple_setup);
}