~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*.c: Check for ARM64 SIMD before using the accelerated code.
[catacomb]
/
symm
/
salsa20.c
diff --git
a/symm/salsa20.c
b/symm/salsa20.c
index
1528598
..
f424b74
100644
(file)
--- a/
symm/salsa20.c
+++ b/
symm/salsa20.c
@@
-78,6
+78,10
@@
extern core__functype salsa20_core_x86ish_sse2;
extern core__functype salsa20_core_arm_neon;
#endif
extern core__functype salsa20_core_arm_neon;
#endif
+#if CPUFAM_ARM64
+extern core__functype salsa20_core_arm64;
+#endif
+
static core__functype *pick_core(void)
{
#if CPUFAM_X86 || CPUFAM_AMD64
static core__functype *pick_core(void)
{
#if CPUFAM_X86 || CPUFAM_AMD64
@@
-88,6
+92,10
@@
static core__functype *pick_core(void)
DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm_neon,
cpu_feature_p(CPUFEAT_ARM_NEON));
#endif
DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm_neon,
cpu_feature_p(CPUFEAT_ARM_NEON));
#endif
+#if CPUFAM_ARM64
+ DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm64,
+ cpu_feature_p(CPUFEAT_ARM_NEON));
+#endif
DISPATCH_PICK_FALLBACK(salsa20_core, simple_core);
}
DISPATCH_PICK_FALLBACK(salsa20_core, simple_core);
}
@@
-767,7
+775,7
@@
static grand *grinit(const void *k, size_t ksz, const void *n,
g->r.r.ops = ops;
g->r.ops = myops;
salsa20_init(&g->ctx, k, ksz, 0);
g->r.r.ops = ops;
g->r.ops = myops;
salsa20_init(&g->ctx, k, ksz, 0);
- myops->setnonce(g, n);
+
if (n)
myops->setnonce(g, n);
return (&g->r.r);
}
return (&g->r.r);
}