From patchwork Mon Jul 22 13:54:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 260720 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AE5702C0095 for ; Tue, 23 Jul 2013 00:06:44 +1000 (EST) Received: from localhost ([::1]:43056 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Gl8-0007Tm-D4 for incoming@patchwork.ozlabs.org; Mon, 22 Jul 2013 10:06:42 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=xfSjb2OKamoz9VNdtVz+1HJqNFERGv6HcHdvpE1Xyv4=; b=Ow1Y96g/p7Bxz0N97qecAqZCrI6pEUg03RYj9bMYOZFOZWiUl5LPoSXi1IdKST3n0l ZbzLs7cVqvDOJgKdip6zaYxDH29idNS2yYrPJSMbN/n3ualQ+AmBFstHIA6ioOZw+aG2 7mO6AbGMmXOJ3l1FRxpICTz+UGMoR0apZEA4z0R/gfCMPafzpwvTLGygxCxWRJyhlqTu M7Bez0Ihx9rT1t7cXM/s2f+tyqxUuOOYowheyNUk97UnL2VgwO24bFLaRVdC/0HO6kNc QN6GRQVCXt5ju+Wkr5qWGiyfCSUnGWzkKcKf5rpomgeCwZuSr1GZfnrG3zcg4lfapwRO hfCA== X-Received: by 10.14.199.134 with SMTP id x6mr27949094een.114.1374501356497; Mon, 22 Jul 2013 06:55:56 -0700 (PDT) Received: from playground.station (net-2-39-8-162.cust.dsl.vodafone.it. [2.39.8.162]) by mx.google.com with ESMTPSA id n42sm50902100eeh.15.2013.07.22.06.55.54 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 22 Jul 2013 06:55:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2013 15:54:37 +0200 Message-Id: <1374501278-31549-28-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1374501278-31549-1-git-send-email-pbonzini@redhat.com> References: <1374501278-31549-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::232 Cc: aliguori@us.ibm.com, aik@ozlabs.ru, agraf@suse.de, hpoussin@reactos.org, jan.kiszka@siemens.com, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 27/28] memory: check memory region endianness, not target's X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); + } } }