memory: correctly handle endian-swapped 64-bit accesses
Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
ce5d2f331e
commit
968a5627c8
12
exec.c
12
exec.c
|
@ -2263,15 +2263,21 @@ static inline uint64_t ldq_phys_internal(hwaddr addr,
|
||||||
false);
|
false);
|
||||||
if (l < 8 || !memory_access_is_direct(section->mr, false)) {
|
if (l < 8 || !memory_access_is_direct(section->mr, false)) {
|
||||||
/* I/O case */
|
/* I/O case */
|
||||||
|
|
||||||
/* XXX This is broken when device endian != cpu endian.
|
|
||||||
Fix and add "endian" variable check */
|
|
||||||
#ifdef TARGET_WORDS_BIGENDIAN
|
#ifdef TARGET_WORDS_BIGENDIAN
|
||||||
val = io_mem_read(section->mr, addr1, 4) << 32;
|
val = io_mem_read(section->mr, addr1, 4) << 32;
|
||||||
val |= io_mem_read(section->mr, addr1 + 4, 4);
|
val |= io_mem_read(section->mr, addr1 + 4, 4);
|
||||||
#else
|
#else
|
||||||
val = io_mem_read(section->mr, addr1, 4);
|
val = io_mem_read(section->mr, addr1, 4);
|
||||||
val |= io_mem_read(section->mr, addr1 + 4, 4) << 32;
|
val |= io_mem_read(section->mr, addr1 + 4, 4) << 32;
|
||||||
|
#endif
|
||||||
|
#if defined(TARGET_WORDS_BIGENDIAN)
|
||||||
|
if (endian == DEVICE_LITTLE_ENDIAN) {
|
||||||
|
val = bswap64(val);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
if (endian == DEVICE_BIG_ENDIAN) {
|
||||||
|
val = bswap64(val);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
/* RAM case */
|
/* RAM case */
|
||||||
|
|
Loading…
Reference in New Issue