From patchwork Mon Jun 27 13:22:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 102164 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2D346B6F83 for ; Mon, 27 Jun 2011 23:37:27 +1000 (EST) Received: from localhost ([::1]:49338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbC0B-0000KE-Py for incoming@patchwork.ozlabs.org; Mon, 27 Jun 2011 09:37:23 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbBle-0005iP-1j for qemu-devel@nongnu.org; Mon, 27 Jun 2011 09:22:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QbBlX-0002GK-TO for qemu-devel@nongnu.org; Mon, 27 Jun 2011 09:22:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbBlV-0002E9-TZ for qemu-devel@nongnu.org; Mon, 27 Jun 2011 09:22:14 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5RDMCwl013827 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Jun 2011 09:22:13 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p5RDMBOR015356; Mon, 27 Jun 2011 09:22:12 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 01973B0648; Mon, 27 Jun 2011 16:22:10 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org Date: Mon, 27 Jun 2011 16:22:04 +0300 Message-Id: <1309180927-19003-18-git-send-email-avi@redhat.com> In-Reply-To: <1309180927-19003-1-git-send-email-avi@redhat.com> References: <1309180927-19003-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kvm@vger.kernel.org Subject: [Qemu-devel] [RFC v2 17/20] cirrus: simplify bitblt BAR access functions 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 Make use of the memory API's ability to satisfy multi-byte accesses via multiple single-byte accesses. Signed-off-by: Avi Kivity --- hw/cirrus_vga.c | 87 ++++++++++-------------------------------------------- 1 files changed, 16 insertions(+), 71 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 0cb34d9..6312c6e 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2445,39 +2445,27 @@ static void cirrus_linear_write(MemoryRegion *mr, target_phys_addr_t addr, ***************************************/ -static uint32_t cirrus_linear_bitblt_readb(void *opaque, target_phys_addr_t addr) +static uint64_t cirrus_linear_bitblt_read(MemoryRegion *mr, + target_phys_addr_t addr, + unsigned size) { + CirrusVGAState *s = container_of(mr, CirrusVGAState, + cirrus_linear_bitblt_io); uint32_t ret; /* XXX handle bitblt */ + (void)s; ret = 0xff; return ret; } -static uint32_t cirrus_linear_bitblt_readw(void *opaque, target_phys_addr_t addr) -{ - uint32_t v; - - v = cirrus_linear_bitblt_readb(opaque, addr); - v |= cirrus_linear_bitblt_readb(opaque, addr + 1) << 8; - return v; -} - -static uint32_t cirrus_linear_bitblt_readl(void *opaque, target_phys_addr_t addr) -{ - uint32_t v; - - v = cirrus_linear_bitblt_readb(opaque, addr); - v |= cirrus_linear_bitblt_readb(opaque, addr + 1) << 8; - v |= cirrus_linear_bitblt_readb(opaque, addr + 2) << 16; - v |= cirrus_linear_bitblt_readb(opaque, addr + 3) << 24; - return v; -} - -static void cirrus_linear_bitblt_writeb(void *opaque, target_phys_addr_t addr, - uint32_t val) +static void cirrus_linear_bitblt_write(MemoryRegion *mr, + target_phys_addr_t addr, + uint64_t val, + unsigned size) { - CirrusVGAState *s = opaque; + CirrusVGAState *s = container_of(mr, CirrusVGAState, + cirrus_linear_bitblt_io); if (s->cirrus_srcptr != s->cirrus_srcptr_end) { /* bitblt */ @@ -2488,57 +2476,14 @@ static void cirrus_linear_bitblt_writeb(void *opaque, target_phys_addr_t addr, } } -static void cirrus_linear_bitblt_writew(void *opaque, target_phys_addr_t addr, - uint32_t val) -{ - cirrus_linear_bitblt_writeb(opaque, addr, val & 0xff); - cirrus_linear_bitblt_writeb(opaque, addr + 1, (val >> 8) & 0xff); -} - -static void cirrus_linear_bitblt_writel(void *opaque, target_phys_addr_t addr, - uint32_t val) -{ - cirrus_linear_bitblt_writeb(opaque, addr, val & 0xff); - cirrus_linear_bitblt_writeb(opaque, addr + 1, (val >> 8) & 0xff); - cirrus_linear_bitblt_writeb(opaque, addr + 2, (val >> 16) & 0xff); - cirrus_linear_bitblt_writeb(opaque, addr + 3, (val >> 24) & 0xff); -} - -static uint64_t cirrus_linear_bitblt_read(MemoryRegion *mr, - target_phys_addr_t addr, - unsigned size) -{ - CirrusVGAState *s = container_of(mr, CirrusVGAState, - cirrus_linear_bitblt_io); - - switch (size) { - case 1: return cirrus_linear_bitblt_readb(s, addr); - case 2: return cirrus_linear_bitblt_readw(s, addr); - case 4: return cirrus_linear_bitblt_readl(s, addr); - default: abort(); - } -}; - -static void cirrus_linear_bitblt_write(MemoryRegion *mr, - target_phys_addr_t addr, - uint64_t data, - unsigned size) -{ - CirrusVGAState *s = container_of(mr, CirrusVGAState, - cirrus_linear_bitblt_io); - - switch (size) { - case 1: return cirrus_linear_bitblt_writeb(s, addr, data); - case 2: return cirrus_linear_bitblt_writew(s, addr, data); - case 4: return cirrus_linear_bitblt_writel(s, addr, data); - default: abort(); - } -}; - static MemoryRegionOps cirrus_linear_bitblt_io_ops = { .read = cirrus_linear_bitblt_read, .write = cirrus_linear_bitblt_write, .endianness = DEVICE_LITTLE_ENDIAN, + .impl = { + .min_access_size = 1, + .max_access_size = 1, + }, }; #include "exec-memory.h"