From patchwork Thu May 30 21:03:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 247776 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 3A16C2C0089 for ; Fri, 31 May 2013 07:14:13 +1000 (EST) Received: from localhost ([::1]:50181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiAAk-00013w-5F for incoming@patchwork.ozlabs.org; Thu, 30 May 2013 17:14:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiA1c-0003yg-OF for qemu-devel@nongnu.org; Thu, 30 May 2013 17:04:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UiA1X-0001kM-Tj for qemu-devel@nongnu.org; Thu, 30 May 2013 17:04:44 -0400 Received: from mail-ea0-x235.google.com ([2a00:1450:4013:c01::235]:40321) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiA1X-0001kF-KA for qemu-devel@nongnu.org; Thu, 30 May 2013 17:04:39 -0400 Received: by mail-ea0-f181.google.com with SMTP id a11so850872eae.26 for ; Thu, 30 May 2013 14:04:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=iSEdOfuzy7gTXaxwDDQUwxkYYvKNWUvNjwsMuE8NmX8=; b=tMR9oIMGR1dIasKJYGELjz0UJf+V8h9ltVQDl8J73lP4tMxQ0/eyzjp6DAAiPSaxbI LF/bwUgm0wpi0QFGg+meEUmRcj7SamU9zaeiEEq1CM1azVLeRSxrTheFE1qcKKgzjuXB buc6eFpMVDCSVJ2sJsoAQnq7yN+fFMiRgUBXe+6XK83de/c0U3wVGvi0G6BTdiVPtAZ9 K0CxA3VF6z6n3Ne0qjfhmdBOLg96LdYsqZPLEUvZwpIb3haZTJRi7HpbTDnYwlzDH0wY V0RcouGzT/7IAXLe0xgfQxi4PESmrZjlavEYuIvW1DduKX5Xof/n+9yt0vBRICm5sqrB wccA== X-Received: by 10.14.214.198 with SMTP id c46mr11217628eep.82.1369947878998; Thu, 30 May 2013 14:04:38 -0700 (PDT) Received: from playground.lan (net-37-116-217-184.cust.dsl.vodafone.it. [37.116.217.184]) by mx.google.com with ESMTPSA id y2sm62707218eeu.2.2013.05.30.14.04.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 30 May 2013 14:04:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 30 May 2013 23:03:52 +0200 Message-Id: <1369947836-2638-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1369947836-2638-1-git-send-email-pbonzini@redhat.com> References: <1369947836-2638-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::235 Subject: [Qemu-devel] [PATCH 18/22] memory: split accesses even when the old MMIO callbacks are used 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 This is useful for 64-bit memory accesses. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- memory.c | 63 +++++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 46 insertions(+), 17 deletions(-) diff --git a/memory.c b/memory.c index 679bd8d..ca27102 100644 --- a/memory.c +++ b/memory.c @@ -302,6 +302,20 @@ static void flatview_simplify(FlatView *view) } } +static void memory_region_oldmmio_read_accessor(void *opaque, + hwaddr addr, + uint64_t *value, + unsigned size, + unsigned shift, + uint64_t mask) +{ + MemoryRegion *mr = opaque; + uint64_t tmp; + + tmp = mr->ops->old_mmio.read[ctz32(size)](mr->opaque, addr); + *value |= (tmp & mask) << shift; +} + static void memory_region_read_accessor(void *opaque, hwaddr addr, uint64_t *value, @@ -319,6 +333,20 @@ static void memory_region_read_accessor(void *opaque, *value |= (tmp & mask) << shift; } +static void memory_region_oldmmio_write_accessor(void *opaque, + hwaddr addr, + uint64_t *value, + unsigned size, + unsigned shift, + uint64_t mask) +{ + MemoryRegion *mr = opaque; + uint64_t tmp; + + tmp = (*value >> shift) & mask; + mr->ops->old_mmio.write[ctz32(size)](mr->opaque, addr, tmp); +} + static void memory_region_write_accessor(void *opaque, hwaddr addr, uint64_t *value, @@ -359,6 +387,8 @@ static void access_with_adjusted_size(hwaddr addr, if (!access_size_max) { access_size_max = 4; } + + /* 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) { @@ -902,16 +932,16 @@ static uint64_t memory_region_dispatch_read1(MemoryRegion *mr, return unassigned_mem_read(mr, addr, size); } - if (!mr->ops->read) { - return mr->ops->old_mmio.read[ctz32(size)](mr->opaque, addr); + if (mr->ops->read) { + access_with_adjusted_size(addr, &data, size, + mr->ops->impl.min_access_size, + mr->ops->impl.max_access_size, + memory_region_read_accessor, mr); + } else { + access_with_adjusted_size(addr, &data, size, 1, 4, + memory_region_oldmmio_read_accessor, mr); } - /* FIXME: support unaligned access */ - access_with_adjusted_size(addr, &data, size, - mr->ops->impl.min_access_size, - mr->ops->impl.max_access_size, - memory_region_read_accessor, mr); - return data; } @@ -956,16 +986,15 @@ static void memory_region_dispatch_write(MemoryRegion *mr, adjust_endianness(mr, &data, size); - if (!mr->ops->write) { - mr->ops->old_mmio.write[ctz32(size)](mr->opaque, addr, data); - return; + if (mr->ops->write) { + access_with_adjusted_size(addr, &data, size, + mr->ops->impl.min_access_size, + mr->ops->impl.max_access_size, + memory_region_write_accessor, mr); + } else { + access_with_adjusted_size(addr, &data, size, 1, 4, + memory_region_oldmmio_write_accessor, mr); } - - /* FIXME: support unaligned access */ - access_with_adjusted_size(addr, &data, size, - mr->ops->impl.min_access_size, - mr->ops->impl.max_access_size, - memory_region_write_accessor, mr); } void memory_region_init_io(MemoryRegion *mr,