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/zsub.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/zsub.c') diff --git a/src/zsub.c b/src/zsub.c index bf918da..e769e32 100644 --- a/src/zsub.c +++ b/src/zsub.c @@ -10,11 +10,11 @@ zsub_unsigned(z_t a, z_t b, z_t c) size_t i, n; int magcmp; - if (EXPECT(zzero(b), 0)) { + if (unlikely(zzero(b))) { zabs(a, c); zneg(a, a); return; - } else if (EXPECT(zzero(c), 0)) { + } else if (unlikely(zzero(c))) { zabs(a, b); return; } @@ -61,15 +61,15 @@ zsub_unsigned(z_t a, z_t b, z_t c) void zsub(z_t a, z_t b, z_t c) { - if (EXPECT(b == c, 0)) { + if (unlikely(b == c)) { SET_SIGNUM(a, 0); - } else if (EXPECT(zzero(b), 0)) { + } else if (unlikely(zzero(b))) { zneg(a, c); - } else if (EXPECT(zzero(c), 0)) { + } else if (unlikely(zzero(c))) { SET(a, b); - } 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)) { zsub_unsigned(a, c, b); } else { zadd_unsigned(a, b, c); -- cgit v1.2.3-70-g09d2