From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Gal-00070N-6b for qemu-devel@nongnu.org; Mon, 22 Jul 2013 09:56:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1Gaj-0006CY-Fm for qemu-devel@nongnu.org; Mon, 22 Jul 2013 09:55:59 -0400 Received: from mail-ea0-x232.google.com ([2a00:1450:4013:c01::232]:50978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Gaj-0006CJ-8B for qemu-devel@nongnu.org; Mon, 22 Jul 2013 09:55:57 -0400 Received: by mail-ea0-f178.google.com with SMTP id l15so3906156eak.9 for ; Mon, 22 Jul 2013 06:55:56 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 22 Jul 2013 15:54:37 +0200 Message-Id: <1374501278-31549-28-git-send-email-pbonzini@redhat.com> In-Reply-To: <1374501278-31549-1-git-send-email-pbonzini@redhat.com> References: <1374501278-31549-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 27/28] memory: check memory region endianness, not target's List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, aik@ozlabs.ru, agraf@suse.de, hpoussin@reactos.org, jan.kiszka@siemens.com, aurelien@aurel32.net 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: Paolo Bonzini --- memory.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/memory.c b/memory.c index 77a34dd..b9139c5 100644 --- a/memory.c +++ b/memory.c @@ -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); + } } } -- 1.8.1.4