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/zmodpow.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/zmodpow.c') diff --git a/src/zmodpow.c b/src/zmodpow.c index ed87ac5..9e002ff 100644 --- a/src/zmodpow.c +++ b/src/zmodpow.c @@ -12,22 +12,22 @@ zmodpow(z_t a, z_t b, z_t c, z_t d) size_t i, j, n, bits; zahl_char_t x; - if (EXPECT(zsignum(c) <= 0, 0)) { + if (unlikely(zsignum(c) <= 0)) { if (zzero(c)) { if (zzero(b)) - FAILURE(EDOM); /* Indeterminate form: 0:th power of 0 */ + libzahl_failure(-ZERROR_0_POW_0); else if (zzero(d)) - FAILURE(EDOM); /* Undefined form: Division by 0 */ + libzahl_failure(-ZERROR_DIV_0); zsetu(a, 1); - } else if (zzero(b) || zzero(d)) { - FAILURE(EDOM); /* Undefined form: Division by 0 */ + } else if (zzero1(b, d)) { + libzahl_failure(-ZERROR_DIV_0); } else { SET_SIGNUM(a, 0); } return; - } else if (EXPECT(zzero(d), 0)) { - FAILURE(EDOM); /* Undefined form: Division by 0 */ - } else if (EXPECT(zzero(b), 0)) { + } else if (unlikely(zzero(d))) { + libzahl_failure(-ZERROR_DIV_0); + } else if (unlikely(zzero(b))) { SET_SIGNUM(a, 0); return; } -- cgit v1.2.3-70-g09d2