ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util/hbitmap.c: Use ctpopl rather than reimplementing a local equivalent 

The function popcountl() in hbitmap.c is effectively a reimplementation
of what host-utils.h provides as ctpopl(). Use ctpopl() directly; this fixes
a failure to compile on NetBSD (whose strings.h erroneously exposes a
system popcountl() which clashes with this one).

Reported-by: Martin Husemann <martin@duskware.de>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-06-04 00:07:20 +01:00
parent 6b24119b7f
commit 591b320ad0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/hbitmap.c
View File

@ -92,11 +92,6 @@ struct HBitmap {
unsigned long *levels[HBITMAP_LEVELS]; unsigned long *levels[HBITMAP_LEVELS];
}; };
static inline int popcountl(unsigned long l)
{
return BITS_PER_LONG == 32 ? ctpop32(l) : ctpop64(l);
}
/* Advance hbi to the next nonzero word and return it. hbi->pos /* Advance hbi to the next nonzero word and return it. hbi->pos
* is updated. Returns zero if we reach the end of the bitmap. * is updated. Returns zero if we reach the end of the bitmap.
*/ */
@ -200,14 +195,14 @@ static uint64_t hb_count_between(HBitmap *hb, uint64_t start, uint64_t last)
if (pos >= (end >> BITS_PER_LEVEL)) { if (pos >= (end >> BITS_PER_LEVEL)) {
break; break;
} }
count += popcountl(cur); count += ctpopl(cur);
} }
if (pos == (end >> BITS_PER_LEVEL)) { if (pos == (end >> BITS_PER_LEVEL)) {
/* Drop bits representing the END-th and subsequent items. */ /* Drop bits representing the END-th and subsequent items. */
int bit = end & (BITS_PER_LONG - 1); int bit = end & (BITS_PER_LONG - 1);
cur &= (1UL << bit) - 1; cur &= (1UL << bit) - 1;
count += popcountl(cur); count += ctpopl(cur);
} }
return count; return count;