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/zlsh.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/zlsh.c') diff --git a/src/zlsh.c b/src/zlsh.c index 3daa01d..42894e0 100644 --- a/src/zlsh.c +++ b/src/zlsh.c @@ -8,11 +8,11 @@ zlsh(z_t a, z_t b, size_t bits) size_t i, chars, cbits; zahl_char_t carry[] = {0, 0}; - if (EXPECT(zzero(b), 0)) { + if (unlikely(zzero(b))) { SET_SIGNUM(a, 0); return; } - if (EXPECT(!bits, 0)) { + if (unlikely(!bits)) { SET(a, b); return; } @@ -22,14 +22,14 @@ zlsh(z_t a, z_t b, size_t bits) cbits = BITS_PER_CHAR - bits; ENSURE_SIZE(a, b->used + chars); - if (EXPECT(a == b, 1)) + if (likely(a == b)) zmemmove(a->chars + chars, b->chars, b->used); else zmemcpy(a->chars + chars, b->chars, b->used); zmemset(a->chars, 0, chars); a->used = b->used + chars; - if (EXPECT(bits, 1)) { /* This if statement is very important in C. */ + if (likely(bits)) { /* This if statement is very important in C. */ for (i = chars; i < a->used; i++) { carry[~i & 1] = a->chars[i] >> cbits; a->chars[i] <<= bits; -- cgit v1.2.3-70-g09d2