[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/38] cirrus: simplify bitblt BAR access functio
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 05/38] cirrus: simplify bitblt BAR access functions |
Date: |
Wed, 3 Aug 2011 14:55:35 +0300 |
Make use of the memory API's ability to satisfy multi-byte accesses via
multiple single-byte accesses.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/cirrus_vga.c | 81 +++++++++----------------------------------------------
1 files changed, 13 insertions(+), 68 deletions(-)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 6e1aa75..b8a51b4 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2445,37 +2445,23 @@ static void cirrus_linear_write(void *opaque,
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(void *opaque,
+ target_phys_addr_t addr,
+ unsigned size)
{
+ CirrusVGAState *s = opaque;
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(void *opaque,
+ target_phys_addr_t addr,
+ uint64_t val,
+ unsigned size)
{
CirrusVGAState *s = opaque;
@@ -2488,55 +2474,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(void *opaque,
- target_phys_addr_t addr,
- unsigned size)
-{
- CirrusVGAState *s = opaque;
-
- 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(void *opaque,
- target_phys_addr_t addr,
- uint64_t data,
- unsigned size)
-{
- CirrusVGAState *s = opaque;
-
- 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 const 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"
--
1.7.5.3
- [Qemu-devel] [PATCH v2 00/38] Memory API, batch 2: PCI devices, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 01/38] pci: add API to get a BAR's mapped address, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 04/38] cirrus: simplify mmio BAR access functions, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 20/38] ahci: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 33/38] pci: remove pci_register_bar_simple(), Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 22/38] lsi53c895a: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 02/38] vmsvga: don't remember pci BAR address in callback any more, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 13/38] ac97: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 29/38] ehci: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 05/38] cirrus: simplify bitblt BAR access functions,
Avi Kivity <=
- [Qemu-devel] [PATCH v2 36/38] pci: fold BAR mapping function into its caller, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 31/38] xen-platform: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 18/38] ivshmem: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 03/38] vga: convert vga and its derivatives to the memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 10/38] pci: pass I/O address space to new PCI bus, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 07/38] vga: simplify vga window mmio access functions, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 15/38] eepro100: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 09/38] Integrate I/O memory regions into qemu, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 08/38] cirrus: simplify linear framebuffer access functions, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 14/38] e1000: convert to memory API, Avi Kivity, 2011/08/03