[v3,06/39] cirrus: simplify bitblt BAR access functions

Make use of the memory API's ability to satisfy multi-byte accesses via
multiple single-byte accesses.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
---
 hw/cirrus_vga.c |   81 +++++++++----------------------------------------------
 1 files changed, 13 insertions(+), 68 deletions(-)

On 08/04/2011 08:06 AM, Avi Kivity wrote:
> Make use of the memory API's ability to satisfy multi-byte accesses via
> multiple single-byte accesses.
>
> Reviewed-by: Richard Henderson<rth@twiddle.net>
> Signed-off-by: Avi Kivity<avi@redhat.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

> ---
>   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"