diff options
| author | Richard Henderson <rth@twiddle.net> | 2013-02-13 17:47:36 -0800 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-02-16 11:11:34 +0000 |
| commit | 18331e7c189507513008a2936f5fe79c3d8b8a08 (patch) | |
| tree | d29a74fa9fbab380a6770c4a8181786111f13fbb | |
| parent | 72d81155d0b88ba757c5a972d3fff83027e7a6e7 (diff) | |
hbitmap: Use non-bitops ctzl
Both uses of ctz have already eliminated zero, and thus the difference
in edge conditions between the two routines is irrelevant.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | include/qemu/hbitmap.h | 3 | ||||
| -rw-r--r-- | util/hbitmap.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/qemu/hbitmap.h b/include/qemu/hbitmap.h index 250de03b03..550d7ce2c3 100644 --- a/include/qemu/hbitmap.h +++ b/include/qemu/hbitmap.h @@ -16,6 +16,7 @@ #include <stdint.h> #include <stdbool.h> #include "bitops.h" +#include "host-utils.h" typedef struct HBitmap HBitmap; typedef struct HBitmapIter HBitmapIter; @@ -170,7 +171,7 @@ static inline int64_t hbitmap_iter_next(HBitmapIter *hbi) /* The next call will resume work from the next bit. */ hbi->cur[HBITMAP_LEVELS - 1] = cur & (cur - 1); - item = ((uint64_t)hbi->pos << BITS_PER_LEVEL) + bitops_ctzl(cur); + item = ((uint64_t)hbi->pos << BITS_PER_LEVEL) + ctzl(cur); return item << hbi->granularity; } diff --git a/util/hbitmap.c b/util/hbitmap.c index a0df5d3591..d93683128b 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -126,7 +126,8 @@ unsigned long hbitmap_iter_skip_words(HBitmapIter *hbi) * The index of this word's least significant set bit provides * the low-order bits. */ - pos = (pos << BITS_PER_LEVEL) + bitops_ctzl(cur); + assert(cur); + pos = (pos << BITS_PER_LEVEL) + ctzl(cur); hbi->cur[i] = cur & (cur - 1); /* Set up next level for iteration. */ |