aboutsummaryrefslogtreecommitdiffstats
path: root/src/zxor.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2016-03-13 23:54:56 +0100
committerMattias Andrée <maandree@kth.se>2016-03-13 23:54:56 +0100
commit5b10b24044b3350a19ab3d3c0b37b5e9c12365b1 (patch)
tree3f6aa8de29becc5d7511fcca50e6d31982c1b64b /src/zxor.c
parentOptimisations (diff)
downloadlibzahl-5b10b24044b3350a19ab3d3c0b37b5e9c12365b1.tar.gz
libzahl-5b10b24044b3350a19ab3d3c0b37b5e9c12365b1.tar.bz2
libzahl-5b10b24044b3350a19ab3d3c0b37b5e9c12365b1.tar.xz
Multiple changes:
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 <maandree@kth.se>
Diffstat (limited to 'src/zxor.c')
-rw-r--r--src/zxor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/zxor.c b/src/zxor.c
index da56a24..876591a 100644
--- a/src/zxor.c
+++ b/src/zxor.c
@@ -7,13 +7,13 @@ zxor(z_t a, z_t b, z_t c)
{
size_t n, m;
- if (EXPECT(zzero(b), 0)) {
+ if (unlikely(zzero(b))) {
if (zzero(c))
SET_SIGNUM(a, 0);
else
SET(a, c);
return;
- } else if (EXPECT(zzero(c), 0)) {
+ } else if (unlikely(zzero(c))) {
SET(a, b);
return;
}
@@ -28,7 +28,7 @@ zxor(z_t a, z_t b, z_t c)
zmemcpy(a->chars + n, c->chars + n, m - n);
while (n--)
a->chars[n] ^= c->chars[n];
- } else if (EXPECT(a == c, 0)) {
+ } else if (unlikely(a == c)) {
if (c->used < b->used)
zmemcpy(a->chars + n, b->chars + n, m - n);
while (n--)