From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnUg9-0005nm-NF for qemu-devel@nongnu.org; Mon, 02 Dec 2013 09:41:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnUg1-0005pp-AC for qemu-devel@nongnu.org; Mon, 02 Dec 2013 09:40:53 -0500 Received: from mail-qe0-x234.google.com ([2607:f8b0:400d:c02::234]:38887) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnUg1-0005pl-5k for qemu-devel@nongnu.org; Mon, 02 Dec 2013 09:40:45 -0500 Received: by mail-qe0-f52.google.com with SMTP id ne12so13151297qeb.25 for ; Mon, 02 Dec 2013 06:40:44 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 2 Dec 2013 15:40:25 +0100 Message-Id: <1385995228-19585-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <1385994239-19016-1-git-send-email-pbonzini@redhat.com> References: <1385994239-19016-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] memory: cache min/max_access_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.a@redhat.com This will simplify the code in the next patch. Signed-off-by: Paolo Bonzini --- include/exec/memory.h | 2 ++ memory.c | 27 +++++++++++---------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 480dfbf..cf63adb 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -163,6 +163,8 @@ struct MemoryRegion { unsigned ioeventfd_nb; MemoryRegionIoeventfd *ioeventfds; NotifierList iommu_notify; + + uint8_t min_access_size, max_access_size; }; typedef struct MemoryListener MemoryListener; diff --git a/memory.c b/memory.c index 28f6449..56e54aa 100644 --- a/memory.c +++ b/memory.c @@ -443,8 +443,6 @@ static void memory_region_write_accessor(MemoryRegion *mr, static void access_with_adjusted_size(hwaddr addr, uint64_t *value, unsigned size, - unsigned access_size_min, - unsigned access_size_max, void (*access)(MemoryRegion *mr, hwaddr addr, uint64_t *value, @@ -457,15 +455,8 @@ static void access_with_adjusted_size(hwaddr addr, unsigned access_size; unsigned i; - if (!access_size_min) { - access_size_min = 1; - } - if (!access_size_max) { - access_size_max = 4; - } - /* FIXME: support unaligned access? */ - access_size = MAX(MIN(size, access_size_max), access_size_min); + access_size = MAX(MIN(size, mr->min_access_size), mr->min_access_size); access_mask = -1ULL >> (64 - access_size * 8); if (memory_region_big_endian(mr)) { for (i = 0; i < size; i += access_size) { @@ -942,11 +933,9 @@ static uint64_t memory_region_dispatch_read1(MemoryRegion *mr, 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, + access_with_adjusted_size(addr, &data, size, memory_region_oldmmio_read_accessor, mr); } @@ -982,11 +971,9 @@ static bool memory_region_dispatch_write(MemoryRegion *mr, 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, + access_with_adjusted_size(addr, &data, size, memory_region_oldmmio_write_accessor, mr); } return false; @@ -1004,6 +991,14 @@ void memory_region_init_io(MemoryRegion *mr, mr->opaque = opaque; mr->terminates = true; mr->ram_addr = ~(ram_addr_t)0; + + if (mr->ops->read) { + mr->min_access_size = mr->ops->impl.min_access_size ? : 1; + mr->max_access_size = mr->ops->impl.max_access_size ? : 4; + } else { + mr->min_access_size = 1; + mr->max_access_size = 4; + } } void memory_region_init_ram(MemoryRegion *mr, -- 1.8.4.2