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/zadd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/zadd.c') diff --git a/src/zadd.c b/src/zadd.c index ec17ca4..9891b00 100644 --- a/src/zadd.c +++ b/src/zadd.c @@ -9,10 +9,10 @@ zadd_unsigned(z_t a, z_t b, z_t c) uint32_t carry[] = {0, 0}; zahl_char_t *addend; - if (EXPECT(zzero(b), 0)) { + if (unlikely(zzero(b))) { zabs(a, c); return; - } else if (EXPECT(zzero(c), 0)) { + } else if (unlikely(zzero(c))) { zabs(a, b); return; } @@ -29,7 +29,7 @@ zadd_unsigned(z_t a, z_t b, z_t c) zmemset(a->chars + a->used, 0, n - a->used); } addend = c->chars; - } else if (EXPECT(a == c, 0)) { + } else if (unlikely(a == c)) { if (a->used < b->used) { n = b->used; zmemset(a->chars + a->used, 0, n - a->used); @@ -67,15 +67,15 @@ zadd_unsigned(z_t a, z_t b, z_t c) void zadd(z_t a, z_t b, z_t c) { - if (EXPECT(zzero(b), 0)) { + if (unlikely(zzero(b))) { SET(a, c); - } else if (EXPECT(zzero(c), 0)) { + } else if (unlikely(zzero(c))) { SET(a, b); - } else if (EXPECT(b == c, 0)) { + } else if (unlikely(b == c)) { zlsh(a, b, 1); - } 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)) { zadd_unsigned(a, b, c); SET_SIGNUM(a, -zsignum(a)); } else { -- cgit v1.2.3-70-g09d2