diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-24 17:58:37 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-29 16:27:26 +0200 |
commit | 968a5627c80ff2b9fd1ed40f9400897088bd661a (patch) | |
tree | 5988478db3307611ed43d2ce5f50f4136861be98 | |
parent | ce5d2f331ec42b43f92aa4c57fdaaf4c34ccb377 (diff) | |
download | qemu-968a5627c80ff2b9fd1ed40f9400897088bd661a.zip qemu-968a5627c80ff2b9fd1ed40f9400897088bd661a.tar.gz qemu-968a5627c80ff2b9fd1ed40f9400897088bd661a.tar.bz2 |
memory: correctly handle endian-swapped 64-bit accesses
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | exec.c | 12 | ||||
-rw-r--r-- | memory.c | 3 |
2 files changed, 12 insertions, 3 deletions
@@ -2263,9 +2263,6 @@ static inline uint64_t ldq_phys_internal(hwaddr addr, false); if (l < 8 || !memory_access_is_direct(section->mr, false)) { /* I/O case */ - - /* XXX This is broken when device endian != cpu endian. - Fix and add "endian" variable check */ #ifdef TARGET_WORDS_BIGENDIAN val = io_mem_read(section->mr, addr1, 4) << 32; val |= io_mem_read(section->mr, addr1 + 4, 4); @@ -2273,6 +2270,15 @@ static inline uint64_t ldq_phys_internal(hwaddr addr, val = io_mem_read(section->mr, addr1, 4); 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 } else { /* RAM case */ ptr = qemu_get_ram_ptr((memory_region_get_ram_addr(section->mr) @@ -957,6 +957,9 @@ static void adjust_endianness(MemoryRegion *mr, uint64_t *data, unsigned size) case 4: *data = bswap32(*data); break; + case 8: + *data = bswap64(*data); + break; default: abort(); } |