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/zor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/zor.c') diff --git a/src/zor.c b/src/zor.c index b67f5b3..4e7a2dc 100644 --- a/src/zor.c +++ b/src/zor.c @@ -7,13 +7,13 @@ zor(z_t a, z_t b, z_t c) { size_t n, m; - if (EXPECT(zzero(b), 0)) { + if (unlikely(zzero(b))) { if (zzero(c)) SET_SIGNUM(a, 0); else SET(a, c); return; - } else if (EXPECT(zzero(c), 0)) { + } else if (unlikely(zzero(c))) { SET(a, b); return; } @@ -28,7 +28,7 @@ zor(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 (EXPECT(a == c, 0)) { + } else if (unlikely(a == c)) { if (c->used < b->used) zmemcpy(a->chars + n, b->chars + n, m - n); while (n--) @@ -44,5 +44,5 @@ zor(z_t a, z_t b, z_t c) } a->used = m; - SET_SIGNUM(a, (zsignum(b) > 0 && zsignum(c) > 0) * 2 - 1); + SET_SIGNUM(a, zpositive2(b, c) * 2 - 1); } -- cgit v1.2.3-70-g09d2