symm/{chacha,salsa20}-*.S: Indent the hoisted transposition instructions.

[catacomb] / symm / chacha.c

diff --git a/symm/chacha.c b/symm/chacha.c
index 0c8aa00..abcc1bd 100644 (file)
--- a/symm/chacha.c
+++ b/symm/chacha.c
@@ -62,11 +62,9 @@ const octet chacha_keysz[] = { KSZ_SET, 32, 16, 10, 0 };
  *             the feedforward step.
  */
 
-CPU_DISPATCH(static, (void),
-            void, core, (unsigned r, const chacha_matrix src,
-                         chacha_matrix dest),
-            (r, src, dest),
-            pick_core, simple_core);
+CPU_DISPATCH(static, (void), void, core,
+            (unsigned r, const chacha_matrix src, chacha_matrix dest),
+            (r, src, dest), pick_core, simple_core);
 
 static void simple_core(unsigned r, const chacha_matrix src,
                        chacha_matrix dest)
@@ -76,12 +74,20 @@ static void simple_core(unsigned r, const chacha_matrix src,
 extern core__functype chacha_core_x86ish_sse2;
 #endif
 
+#if CPUFAM_ARMEL
+extern core__functype chacha_core_arm_neon;
+#endif
+
 static core__functype *pick_core(void)
 {
 #if CPUFAM_X86 || CPUFAM_AMD64
   DISPATCH_PICK_COND(chacha_core, chacha_core_x86ish_sse2,
                     cpu_feature_p(CPUFEAT_X86_SSE2));
 #endif
+#if CPUFAM_ARMEL
+  DISPATCH_PICK_COND(chacha_core, chacha_core_arm_neon,
+                    cpu_feature_p(CPUFEAT_ARM_NEON));
+#endif
   DISPATCH_PICK_FALLBACK(chacha_core, simple_core);
 }