diff options
| author | Mattias Andrée <maandree@kth.se> | 2016-03-13 23:54:56 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2016-03-13 23:54:56 +0100 |
| commit | 5b10b24044b3350a19ab3d3c0b37b5e9c12365b1 (patch) | |
| tree | 3f6aa8de29becc5d7511fcca50e6d31982c1b64b /src/ztrunc.c | |
| parent | Optimisations (diff) | |
| download | libzahl-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/ztrunc.c')
| -rw-r--r-- | src/ztrunc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ztrunc.c b/src/ztrunc.c index 7dcafd9..91d2a92 100644 --- a/src/ztrunc.c +++ b/src/ztrunc.c @@ -8,7 +8,7 @@ ztrunc(z_t a, z_t b, size_t bits) zahl_char_t mask = 1; size_t chars; - if (EXPECT(zzero(b), 0)) { + if (unlikely(zzero(b))) { SET_SIGNUM(a, 0); return; } @@ -16,14 +16,14 @@ ztrunc(z_t a, z_t b, size_t bits) chars = CEILING_BITS_TO_CHARS(bits); a->sign = b->sign; a->used = MIN(chars, b->used); - if (EXPECT(a->used < chars, 0)) + if (unlikely(a->used < chars)) bits = 0; - if (EXPECT(a != b, 1)) { + if (likely(a != b)) { ENSURE_SIZE(a, a->used); zmemcpy(a->chars, b->chars, a->used); } bits = BITS_IN_LAST_CHAR(bits); - if (EXPECT(!!bits, 1)) { + if (likely(bits)) { mask <<= bits; mask -= 1; a->chars[a->used - 1] &= mask; |