~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
symm/rijndael-x86ish-aesni.S: Have `endswap_block' copy NKW to ECX.
[catacomb]
/
symm
/
rijndael-base.c
diff --git
a/symm/rijndael-base.c
b/symm/rijndael-base.c
index
3d2bb8e
..
b5490c1
100644
(file)
--- a/
symm/rijndael-base.c
+++ b/
symm/rijndael-base.c
@@
-112,18
+112,18
@@
static void simple_setup(rijndael_ctx *k, unsigned nb,
k->wi[i] = k->w[j + jj++];
}
k->wi[i] = k->w[j + jj++];
}
-CPU_DISPATCH(static, EMPTY, void, setup,
(rijndael_ctx *k, unsigned nb,
-
const void *buf, unsigned nk),
+CPU_DISPATCH(static, EMPTY, void, setup,
+
(rijndael_ctx *k, unsigned nb,
const void *buf, unsigned nk),
(k, nb, buf, nk), pick_setup, simple_setup)
(k, nb, buf, nk), pick_setup, simple_setup)
-#if
def CPUFAM_X86
-extern setup__functype rijndael_setup_x86_aesni;
+#if
CPUFAM_X86 || CPUFAM_AMD64
+extern setup__functype rijndael_setup_x86
ish
_aesni;
#endif
static setup__functype *pick_setup(void)
{
#endif
static setup__functype *pick_setup(void)
{
-#if
def CPUFAM_X86
- DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86_aesni,
+#if
CPUFAM_X86 || CPUFAM_AMD64
+ DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86
ish
_aesni,
cpu_feature_p(CPUFEAT_X86_AESNI));
#endif
DISPATCH_PICK_FALLBACK(rijndael_setup, simple_setup);
cpu_feature_p(CPUFEAT_X86_AESNI));
#endif
DISPATCH_PICK_FALLBACK(rijndael_setup, simple_setup);