Commit e7342aa3 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Anthony Liguori

memory: check memory region endianness, not target's

When combining multiple accesses into a single value, we need to do so
in the device's desired endianness.  The target endianness does not have
any influence.
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-28-git-send-email-pbonzini@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 547e9201
......@@ -339,6 +339,15 @@ static void flatview_simplify(FlatView *view)
}
}
static bool memory_region_big_endian(MemoryRegion *mr)
{
#ifdef TARGET_WORDS_BIGENDIAN
return mr->ops->endianness != DEVICE_LITTLE_ENDIAN;
#else
return mr->ops->endianness == DEVICE_BIG_ENDIAN;
#endif
}
static bool memory_region_wrong_endianness(MemoryRegion *mr)
{
#ifdef TARGET_WORDS_BIGENDIAN
......@@ -454,13 +463,15 @@ static void access_with_adjusted_size(hwaddr addr,
/* FIXME: support unaligned access? */
access_size = MAX(MIN(size, access_size_max), access_size_min);
access_mask = -1ULL >> (64 - access_size * 8);
for (i = 0; i < size; i += access_size) {
#ifdef TARGET_WORDS_BIGENDIAN
access(mr, addr + i, value, access_size,
(size - access_size - i) * 8, access_mask);
#else
access(mr, addr + i, value, access_size, i * 8, access_mask);
#endif
if (memory_region_big_endian(mr)) {
for (i = 0; i < size; i += access_size) {
access(mr, addr + i, value, access_size,
(size - access_size - i) * 8, access_mask);
}
} else {
for (i = 0; i < size; i += access_size) {
access(mr, addr + i, value, access_size, i * 8, access_mask);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment