Optimisations

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

1 files changed, 4 insertions, 5 deletions

diff --git a/src/zxor.c b/src/zxor.c
index d152ed7..da56a24 100644
--- a/src/zxor.c
+++ b/src/zxor.c
@@ -7,13 +7,13 @@ zxor(z_t a, z_t b, z_t c)
 {
 	size_t n, m;
 
-	if (zzero(b)) {
+	if (EXPECT(zzero(b), 0)) {
 		if (zzero(c))
 			SET_SIGNUM(a, 0);
 		else
 			SET(a, c);
 		return;
-	} else if (zzero(c)) {
+	} else if (EXPECT(zzero(c), 0)) {
 		SET(a, b);
 		return;
 	}
@@ -28,7 +28,7 @@ zxor(z_t a, z_t b, z_t c)
 			zmemcpy(a->chars + n, c->chars + n, m - n);
 		while (n--)
 			a->chars[n] ^= c->chars[n];
-	} else if (a == c) {
+	} else if (EXPECT(a == c, 0)) {
 		if (c->used < b->used)
 			zmemcpy(a->chars + n, b->chars + n, m - n);
 		while (n--)
@@ -44,8 +44,7 @@ zxor(z_t a, z_t b, z_t c)
 	}
 
 	a->used = m;
-	while (a->used && !a->chars[a->used - 1])
-		a->used--;
+	TRIM(a);
 	if (a->used)
 		SET_SIGNUM(a, 1 - 2 * ((zsignum(b) ^ zsignum(c)) < 0));
 	else