Optimise zand, zor, and zxor

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 6 insertions, 25 deletions

diff --git a/src/zxor.c b/src/zxor.c
index 601a947..3f2ca5c 100644
--- a/src/zxor.c
+++ b/src/zxor.c
@@ -2,27 +2,6 @@
 #include "internals.h"
 
 
-O2 static inline void
-zxor_impl_3(register zahl_char_t *restrict a,
-	    register const zahl_char_t *restrict b, size_t n)
-{
-	size_t i;
-	for (i = 0; i < n; i++)
-		a[i] ^= b[i];
-}
-
-static inline void
-zxor_impl_5(register zahl_char_t *restrict a,
-	    register const zahl_char_t *restrict b, size_t n,
-	    register const zahl_char_t *restrict c, size_t m)
-{
-	size_t i;
-	for (i = 0; i < n; i++)
-		a[i] = b[i] ^ c[i];
-	for (; i < m; i++)
-		a[i] = c[i];
-}
-
 void
 zxor(z_t a, z_t b, z_t c)
 {
@@ -47,17 +26,19 @@ zxor(z_t a, z_t b, z_t c)
 	ENSURE_SIZE(a, m);
 
 	if (a == b) {
-		zxor_impl_3(a->chars, cc, n);
+		ZMEM_OP(a->chars, a->chars, cc, n, ^);
 		if (a->used < cn)
 			zmemcpy_range(a->chars, cc, n, m);
 	} else if (unlikely(a == c)) {
-		zxor_impl_3(a->chars, bc, n);
+		ZMEM_OP(a->chars, b->chars, cc, n, ^);
 		if (a->used < bn)
 			zmemcpy_range(a->chars, bc, n, m);
 	} else if (m == bn) {
-		zxor_impl_5(a->chars, cc, n, bc, m);
+		ZMEM_OP(a->chars, c->chars, b->chars, n, ^);
+		zmemcpy_range(a->chars, b->chars, n, m);
 	} else {
-		zxor_impl_5(a->chars, bc, n, cc, m);
+		ZMEM_OP(a->chars, b->chars, c->chars, n, ^);
+		zmemcpy_range(a->chars, c->chars, n, m);
 	}
 
 	a->used = m;