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/ztrunc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ztrunc.c') diff --git a/src/ztrunc.c b/src/ztrunc.c index 7dcafd9..91d2a92 100644 --- a/src/ztrunc.c +++ b/src/ztrunc.c @@ -8,7 +8,7 @@ ztrunc(z_t a, z_t b, size_t bits) zahl_char_t mask = 1; size_t chars; - if (EXPECT(zzero(b), 0)) { + if (unlikely(zzero(b))) { SET_SIGNUM(a, 0); return; } @@ -16,14 +16,14 @@ ztrunc(z_t a, z_t b, size_t bits) chars = CEILING_BITS_TO_CHARS(bits); a->sign = b->sign; a->used = MIN(chars, b->used); - if (EXPECT(a->used < chars, 0)) + if (unlikely(a->used < chars)) bits = 0; - if (EXPECT(a != b, 1)) { + if (likely(a != b)) { ENSURE_SIZE(a, a->used); zmemcpy(a->chars, b->chars, a->used); } bits = BITS_IN_LAST_CHAR(bits); - if (EXPECT(!!bits, 1)) { + if (likely(bits)) { mask <<= bits; mask -= 1; a->chars[a->used - 1] &= mask; -- cgit v1.2.3-70-g09d2