~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mdw/cpu-dispatch'
[catacomb]
/
symm
/
chacha.c
diff --git
a/symm/chacha.c
b/symm/chacha.c
index
5683c8e
..
0c8aa00
100644
(file)
--- a/
symm/chacha.c
+++ b/
symm/chacha.c
@@
-72,14
+72,14
@@
static void simple_core(unsigned r, const chacha_matrix src,
chacha_matrix dest)
{ CHACHA_nR(dest, src, r); CHACHA_FFWD(dest, src); }
chacha_matrix dest)
{ CHACHA_nR(dest, src, r); CHACHA_FFWD(dest, src); }
-#if
def CPUFAM_X86
-extern core__functype chacha_core_x86_sse2;
+#if
CPUFAM_X86 || CPUFAM_AMD64
+extern core__functype chacha_core_x86
ish
_sse2;
#endif
static core__functype *pick_core(void)
{
#endif
static core__functype *pick_core(void)
{
-#if
def CPUFAM_X86
- DISPATCH_PICK_COND(chacha_core, chacha_core_x86_sse2,
+#if
CPUFAM_X86 || CPUFAM_AMD64
+ DISPATCH_PICK_COND(chacha_core, chacha_core_x86
ish
_sse2,
cpu_feature_p(CPUFEAT_X86_SSE2));
#endif
DISPATCH_PICK_FALLBACK(chacha_core, simple_core);
cpu_feature_p(CPUFEAT_X86_SSE2));
#endif
DISPATCH_PICK_FALLBACK(chacha_core, simple_core);
@@
-695,7
+695,7
@@
static void grdestroy(grand *r)
static const grand_ops grops_rand_##rr = { \
"chacha" #rr, GRAND_CRYPTO, 0, \
grmisc, grdestroy, grword, \
static const grand_ops grops_rand_##rr = { \
"chacha" #rr, GRAND_CRYPTO, 0, \
grmisc, grdestroy, grword, \
- grbyte, grword, grand_
range, grfill
\
+ grbyte, grword, grand_
defaultrange, grfill
\
}; \
\
grand *chacha##rr##_rand(const void *k, size_t ksz, const void *n) \
}; \
\
grand *chacha##rr##_rand(const void *k, size_t ksz, const void *n) \
@@
-737,7
+737,7
@@
CHACHA_VARS(DEFGRAND)
static const grand_ops grxops_rand_##rr = { \
"xchacha" #rr, GRAND_CRYPTO, 0, \
grmisc, grxdestroy_##rr, grword, \
static const grand_ops grxops_rand_##rr = { \
"xchacha" #rr, GRAND_CRYPTO, 0, \
grmisc, grxdestroy_##rr, grword, \
- grbyte, grword, grand_
range, grfill
\
+ grbyte, grword, grand_
defaultrange, grfill
\
}; \
\
grand *xchacha##rr##_rand(const void *k, size_t ksz, const void *n) \
}; \
\
grand *xchacha##rr##_rand(const void *k, size_t ksz, const void *n) \