From patchwork Fri May 24 17:05:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 246232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B75DE2C016A for ; Sat, 25 May 2013 03:17:16 +1000 (EST) Received: from localhost ([::1]:56741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfvcA-0005ih-TC for incoming@patchwork.ozlabs.org; Fri, 24 May 2013 13:17:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfvS4-0007Bl-8c for qemu-devel@nongnu.org; Fri, 24 May 2013 13:06:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UfvRz-00027C-7U for qemu-devel@nongnu.org; Fri, 24 May 2013 13:06:48 -0400 Received: from mail-ea0-x22c.google.com ([2a00:1450:4013:c01::22c]:59589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfvRy-00026r-Sw for qemu-devel@nongnu.org; Fri, 24 May 2013 13:06:43 -0400 Received: by mail-ea0-f172.google.com with SMTP id d10so2722955eaj.3 for ; Fri, 24 May 2013 10:06:42 -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=IUsR+Hye+S2m1rOgOcovODTX4NTg0zrlSk3yPhv+J9A=; b=b1D6tKvjvb+P5+7Iqoe3eoj/EKrq70+q7YG5o1fjHgVSYlCYlSNSUjnzFYoCEasWaS P/qmGyA6PxONO3Ng+81lfQiaqyhqVZo8jHXIbcJYWyvmE2y5/eNHUXVMH8MS0UAzzHXo vb/Xpa+IPKZsiBsQLW3hToznN0q++RPhhp52vRwPbvb6LQWZtNqJS3VZ/k0ouA+5lBn8 hW4Qg+zjOJdrDf4Ih44DKfGd3bkH4Kzg3mGj6d0TR65awug1QVvAZnAUj/vJ0hzoOzDn WfePi92JtEEy2perTiY42FEcwtxOB3LAvJ+b/5hvmyDGnD+Z78THTRFfv8k0RY+xGrUv 6OMA== X-Received: by 10.14.89.66 with SMTP id b42mr584238eef.89.1369415202119; Fri, 24 May 2013 10:06:42 -0700 (PDT) Received: from playground.lan (net-37-117-138-128.cust.dsl.vodafone.it. [37.117.138.128]) by mx.google.com with ESMTPSA id w43sm24955304eeg.14.2013.05.24.10.06.39 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 24 May 2013 10:06:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 24 May 2013 19:05:53 +0200 Message-Id: <1369415157-8953-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1369415157-8953-1-git-send-email-pbonzini@redhat.com> References: <1369415157-8953-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::22c Cc: peter.maydell@linaro.org 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. Signed-off-by: Paolo Bonzini --- memory.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/memory.c b/memory.c index 9085969..728a6c5 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,