[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v3 22/56] cirrus: simplify bitblt BAR access functions
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v3 22/56] cirrus: simplify bitblt BAR access functions |
Date: |
Sun, 10 Jul 2011 21:14:35 +0300 |
Make use of the memory API's ability to satisfy multi-byte accesses via
multiple single-byte accesses.
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 5ff0ec8..d0db28d 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 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] [RFC v3 07/56] memory: late initialization of ram_addr, (continued)
- [Qemu-devel] [RFC v3 07/56] memory: late initialization of ram_addr, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 16/56] sysbus: add MemoryRegion based memory management API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 06/56] memory: rename MemoryRegion::has_ram_addr to ::terminates, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 12/56] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 19/56] vmsvga: don't remember pci BAR address in callback any more, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 10/56] ioport: register ranges by byte aligned addresses always, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 53/56] pci: convert pci rom to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 23/56] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 04/56] Internal interfaces for memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 33/56] eepro100: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 22/56] cirrus: simplify bitblt BAR access functions,
Avi Kivity <=
- [Qemu-devel] [RFC v3 14/56] pci: pass address space to pci bus when created, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 05/56] memory: abstract address space operations, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 27/56] exec.c: fix initialization of system I/O memory region, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 01/56] Hierarchical memory region API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 36/56] memory: add ioeventfd support, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 39/56] ahci: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 29/56] pci: allow I/O BARs to be registered with pci_register_bar_region(), Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 43/56] ne2000: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 52/56] pci: remove pci_register_bar_simple(), Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 50/56] xen-platform: convert to memory API, Avi Kivity, 2011/07/10