aboutsummaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2013-02-13 17:47:38 -0800
committerBlue Swirl <blauwirbel@gmail.com>2013-02-16 11:12:13 +0000
commit5bbf90be97203c472f47da070c0040b464c0460f (patch)
tree65279c3c79ddeabf76d11f9e8330a25a0ead887d /memory.c
parent265ce4a5ca39fb7f74a803dd61bbd9108ca6cdee (diff)
downloadqemu-5bbf90be97203c472f47da070c0040b464c0460f.zip
qemu-5bbf90be97203c472f47da070c0040b464c0460f.tar.gz
qemu-5bbf90be97203c472f47da070c0040b464c0460f.tar.bz2
memory: Use non-bitops ctzl
A memory size of zero is invalid, and so that edge condition does not occur. Signed-off-by: Richard Henderson <rth@twiddle.net> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/memory.c b/memory.c
index cd7d5e0..92a2196 100644
--- a/memory.c
+++ b/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_ctzl(size)](mr->opaque, addr);
+ return mr->ops->old_mmio.read[ctz32(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_ctzl(size)](mr->opaque, addr, data);
+ mr->ops->old_mmio.write[ctz32(size)](mr->opaque, addr, data);
return;
}