sse code clean up

src/cc20.c

@@ -89,8 +89,8 @@ int cc20_crypt (unsigned char *out, const unsigned char *in, size_t in_len,
 #define ADD _mm_add_epi32
 #define ROL(X,r) (XOR(SL(X,r),SR(X,(32-r))))
 
-#define ONE _mm_setr_epi32(1, 0, 0, 0)
+#define ONE   _mm_setr_epi32(1, 0, 0, 0)
-#define TWO _mm_setr_epi32(2, 0, 0, 0)
+#define TWO   _mm_setr_epi32(2, 0, 0, 0)
 
 #if defined (__SSSE3__) // --- SSSE3
 #define L8  _mm_set_epi32(0x0e0d0c0fL, 0x0a09080bL, 0x06050407L, 0x02010003L)
@@ -128,10 +128,15 @@ int cc20_crypt (unsigned char *out, const unsigned char *in, size_t in_len,
   CC20_ODD_ROUND (A, B, C, D);     \
   CC20_EVEN_ROUND(A, B, C, D)
 
+#define STOREXOR(O,I,X)                                               \
+  _mm_storeu_si128 ((__m128i*)O,                                      \
+                    _mm_xor_si128 (_mm_loadu_si128((__m128i*)I), X)); \
+  I += 16; O += 16                                                    \
+
 int cc20_crypt (unsigned char *out, const unsigned char *in, size_t in_len,
                 const unsigned char *iv, cc20_context_t *ctx) {
 
-  __m128i a, b, c, d, k0, k1, k2, k3, k4, k5, k6, k7;
+  __m128i a, b, c, d, k0, k1, k2, k3, k4, k5, k6, k7, k8, k9, k10, k11;
 
   uint8_t   *keystream8 = (uint8_t*)ctx->keystream32;
 
@@ -162,31 +167,8 @@ int cc20_crypt (unsigned char *out, const unsigned char *in, size_t in_len,
     k0 = ADD(k0, a); k1 = ADD(k1, b); k2 = ADD(k2, c); k3 = ADD(k3, d);
     k4 = ADD(k4, a); k5 = ADD(k5, b); k6 = ADD(k6, c); k7 = ADD(k7, d); k7 = ADD(k7, ONE);
 
-    _mm_storeu_si128 ((__m128i*)out,
+    STOREXOR(out, in, k0); STOREXOR(out, in, k1); STOREXOR(out, in, k2); STOREXOR(out, in, k3);
-                      _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k0));
+    STOREXOR(out, in, k4); STOREXOR(out, in, k5); STOREXOR(out, in, k6); STOREXOR(out, in, k7);
-    in += 16; out += 16;
-    _mm_storeu_si128 ((__m128i*)out,
-                      _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k1));
-    in += 16; out += 16;
-    _mm_storeu_si128 ((__m128i*)out,
-                       _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k2));
-    in += 16; out += 16;
-    _mm_storeu_si128 ((__m128i*)out,
-                       _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k3));
-    in += 16; out += 16;
-
-    _mm_storeu_si128 ((__m128i*)out,
-                       _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k4));
-    in += 16; out += 16;
-    _mm_storeu_si128 ((__m128i*)out,
-                       _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k5));
-    in += 16; out += 16;
-    _mm_storeu_si128 ((__m128i*)out,
-                       _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k6));
-    in += 16; out += 16;
-    _mm_storeu_si128 ((__m128i*)out,
-                       _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k7));
-    in += 16; out += 16;
 
     // increment counter, make sure it is and stays little endian in memory
     d = ADD(d, TWO);
@@ -212,18 +194,7 @@ int cc20_crypt (unsigned char *out, const unsigned char *in, size_t in_len,
 
     k0 = ADD(k0, a); k1 = ADD(k1, b); k2 = ADD(k2, c); k3 = ADD(k3, d);
 
-    _mm_storeu_si128 ((__m128i*)out,
+    STOREXOR(out, in, k0); STOREXOR(out, in, k1); STOREXOR(out, in, k2); STOREXOR(out, in, k3);
-                      _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k0));
-    in += 16; out += 16;
-    _mm_storeu_si128 ((__m128i*)out,
-                      _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k1));
-    in += 16; out += 16;
-    _mm_storeu_si128 ((__m128i*)out,
-                       _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k2));
-    in += 16; out += 16;
-    _mm_storeu_si128 ((__m128i*)out,
-                       _mm_xor_si128 (_mm_loadu_si128((__m128i*)in), k3));
-    in += 16; out += 16;
 
     // increment counter, make sure it is and stays little endian in memory
     d = ADD(d, ONE);