Multiple changes:

1)  Compile test with -O0, it takes too long otherwise.

2)  Add error codes: ZERROR_0_POW_0, ZERROR_0_DIV_0, ZERROR_DIV_0, ZERROR_NEGATIVE.

3)  Add workaround for a bug in clang (src/allocator.c).

4)  Cleanups.

5)  Minor optimisations.

6)  Add inclusion guard for zahl.h.

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

1 files changed, 8 insertions, 8 deletions

diff --git a/src/zsub.c b/src/zsub.c
index bf918da..e769e32 100644
--- a/src/zsub.c
+++ b/src/zsub.c
@@ -10,11 +10,11 @@ zsub_unsigned(z_t a, z_t b, z_t c)
 	size_t i, n;
 	int magcmp;
 
-	if (EXPECT(zzero(b), 0)) {
+	if (unlikely(zzero(b))) {
 		zabs(a, c);
 		zneg(a, a);
 		return;
-	} else if (EXPECT(zzero(c), 0)) {
+	} else if (unlikely(zzero(c))) {
 		zabs(a, b);
 		return;
 	}
@@ -61,15 +61,15 @@ zsub_unsigned(z_t a, z_t b, z_t c)
 void
 zsub(z_t a, z_t b, z_t c)
 {
-	if (EXPECT(b == c, 0)) {
+	if (unlikely(b == c)) {
 		SET_SIGNUM(a, 0);
-	} else if (EXPECT(zzero(b), 0)) {
+	} else if (unlikely(zzero(b))) {
 		zneg(a, c);
-	} else if (EXPECT(zzero(c), 0)) {
+	} else if (unlikely(zzero(c))) {
 		SET(a, b);
-	} else if (EXPECT((zsignum(b) | zsignum(c)) < 0, 0)) {
-		if (zsignum(b) < 0) {
-			if (zsignum(c) < 0) {
+	} else if (unlikely(znegative1(b, c))) {
+		if (znegative(b)) {
+			if (znegative(c)) {
 				zsub_unsigned(a, c, b);
 			} else {
 				zadd_unsigned(a, b, c);