mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
bitops: unify bitops_ffsl with the one in host-utils.h, call it bitops_ctzl
We had two copies of a ffs function for longs with subtly different semantics and, for the one in bitops.h, a confusing name: the result was off-by-one compared to the library function ffsl. Unify the functions into one, and solve the name problem by calling the 0-based functions "bitops_ctzl" and "bitops_ctol" respectively. This also fixes the build on platforms with ffsl, including Mac OS X and Windows. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Tested-by: Andreas Färber <afaerber@suse.de> Tested-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
7b2d977981
commit
fbeadf50f2
6 changed files with 28 additions and 65 deletions
4
memory.c
4
memory.c
|
@ -855,7 +855,7 @@ static uint64_t memory_region_dispatch_read1(MemoryRegion *mr,
|
|||
}
|
||||
|
||||
if (!mr->ops->read) {
|
||||
return mr->ops->old_mmio.read[bitops_ffsl(size)](mr->opaque, addr);
|
||||
return mr->ops->old_mmio.read[bitops_ctzl(size)](mr->opaque, addr);
|
||||
}
|
||||
|
||||
/* FIXME: support unaligned access */
|
||||
|
@ -908,7 +908,7 @@ static void memory_region_dispatch_write(MemoryRegion *mr,
|
|||
adjust_endianness(mr, &data, size);
|
||||
|
||||
if (!mr->ops->write) {
|
||||
mr->ops->old_mmio.write[bitops_ffsl(size)](mr->opaque, addr, data);
|
||||
mr->ops->old_mmio.write[bitops_ctzl(size)](mr->opaque, addr, data);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue