~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
/
salsa20.c
diff --git
a/symm/salsa20.c
b/symm/salsa20.c
index
d3fb69a
..
40f28fc
100644
(file)
--- a/
symm/salsa20.c
+++ b/
symm/salsa20.c
@@
-52,16
+52,17
@@
static void simple_core(unsigned r, const salsa20_matrix src,
salsa20_matrix dest)
{ SALSA20_nR(dest, src, r); SALSA20_FFWD(dest, src); }
salsa20_matrix dest)
{ SALSA20_nR(dest, src, r); SALSA20_FFWD(dest, src); }
-#if
def CPUFAM_X86
-extern core__functype salsa20_core_x86_sse2;
+#if
CPUFAM_X86 || CPUFAM_AMD64
+extern core__functype salsa20_core_x86
ish
_sse2;
#endif
static core__functype *pick_core(void)
{
#endif
static core__functype *pick_core(void)
{
-#ifdef CPUFAM_X86
- if (cpu_feature_p(CPUFEAT_X86_SSE2)) return salsa20_core_x86_sse2;
+#if CPUFAM_X86 || CPUFAM_AMD64
+ DISPATCH_PICK_COND(salsa20_core, salsa20_core_x86ish_sse2,
+ cpu_feature_p(CPUFEAT_X86_SSE2));
#endif
#endif
-
return simple_core
;
+
DISPATCH_PICK_FALLBACK(salsa20_core, simple_core)
;
}
/* --- @populate@ --- *
}
/* --- @populate@ --- *
@@
-694,7
+695,7
@@
static void grdestroy(grand *r)
static const grand_ops grops_rand_##rr = { \
SALSA20_NAME_##rr, GRAND_CRYPTO, 0, \
grmisc, grdestroy, grword, \
static const grand_ops grops_rand_##rr = { \
SALSA20_NAME_##rr, GRAND_CRYPTO, 0, \
grmisc, grdestroy, grword, \
- grbyte, grword, grand_
range, grfill
\
+ grbyte, grword, grand_
defaultrange, grfill
\
}; \
\
grand *SALSA20_DECOR(salsa20, rr, _rand) \
}; \
\
grand *SALSA20_DECOR(salsa20, rr, _rand) \
@@
-737,7
+738,7
@@
SALSA20_VARS(DEFGRAND)
static const grand_ops grxops_rand_##rr = { \
"x" SALSA20_NAME_##rr, GRAND_CRYPTO, 0, \
grmisc, grxdestroy_##rr, grword, \
static const grand_ops grxops_rand_##rr = { \
"x" SALSA20_NAME_##rr, GRAND_CRYPTO, 0, \
grmisc, grxdestroy_##rr, grword, \
- grbyte, grword, grand_
range, grfill
\
+ grbyte, grword, grand_
defaultrange, grfill
\
}; \
\
grand *SALSA20_DECOR(xsalsa20, rr, _rand) \
}; \
\
grand *SALSA20_DECOR(xsalsa20, rr, _rand) \