From 5b10b24044b3350a19ab3d3c0b37b5e9c12365b1 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 13 Mar 2016 23:54:56 +0100 Subject: Multiple changes: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/zand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/zand.c') diff --git a/src/zand.c b/src/zand.c index 65a8962..119f66c 100644 --- a/src/zand.c +++ b/src/zand.c @@ -7,7 +7,7 @@ zand(z_t a, z_t b, z_t c) { size_t n; - if (EXPECT(zzero(b) || zzero(c), 0)) { + if (unlikely(zzero1(b, c))) { SET_SIGNUM(a, 0); return; } @@ -24,7 +24,7 @@ found_highest: if (a == b) { while (n--) a->chars[n] &= c->chars[n]; - } else if (EXPECT(a == c, 0)) { + } else if (unlikely(a == c)) { while (n--) a->chars[n] &= b->chars[n]; } else { @@ -33,5 +33,5 @@ found_highest: while (n--) a->chars[n] &= b->chars[n]; } - SET_SIGNUM(a, (zsignum(b) > 0 || zsignum(c) > 0) * 2 - 1); + SET_SIGNUM(a, zpositive1(b, c) * 2 - 1); } -- cgit v1.2.3-70-g09d2