On 19 February 2017 at 16:35, BALATON Zoltan <bala...@eik.bme.hu> wrote:
> Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
> ---
> hw/display/sm501.c | 6 +++---
> hw/display/sm501_template.h | 31 ++++++++++++++++++-------------
> 2 files changed, 21 insertions(+), 16 deletions(-)
>
> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> index 9091bb5..3d32a3c 100644
> --- a/hw/display/sm501.c
> +++ b/hw/display/sm501.c
> @@ -846,7 +846,7 @@ static const MemoryRegionOps sm501_system_config_ops = {
> .min_access_size = 4,
> .max_access_size = 4,
> },
> - .endianness = DEVICE_NATIVE_ENDIAN,
> + .endianness = DEVICE_LITTLE_ENDIAN,
> };
>
> static uint32_t sm501_palette_read(void *opaque, hwaddr addr)
> @@ -1082,7 +1082,7 @@ static const MemoryRegionOps sm501_disp_ctrl_ops = {
> .min_access_size = 4,
> .max_access_size = 4,
> },
> - .endianness = DEVICE_NATIVE_ENDIAN,
> + .endianness = DEVICE_LITTLE_ENDIAN,
> };
>
> static uint64_t sm501_2d_engine_read(void *opaque, hwaddr addr,
> @@ -1170,7 +1170,7 @@ static const MemoryRegionOps sm501_2d_engine_ops = {
> .min_access_size = 4,
> .max_access_size = 4,
> },
> - .endianness = DEVICE_NATIVE_ENDIAN,
> + .endianness = DEVICE_LITTLE_ENDIAN,
> };
Does this still all work for the sh4eb (big-endian) sysbus device case?
> /* draw line functions for all console modes */
> diff --git a/hw/display/sm501_template.h b/hw/display/sm501_template.h
> index 832ee61..5b516d6 100644
> --- a/hw/display/sm501_template.h
> +++ b/hw/display/sm501_template.h
> @@ -64,10 +64,16 @@ static void glue(draw_line16_, PIXEL_NAME)(
> uint8_t r, g, b;
>
> do {
> - rgb565 = lduw_p(s);
> - r = ((rgb565 >> 11) & 0x1f) << 3;
> - g = ((rgb565 >> 5) & 0x3f) << 2;
> - b = ((rgb565 >> 0) & 0x1f) << 3;
> + rgb565 = lduw_le_p(s);
> +#if defined(TARGET_WORDS_BIGENDIAN)
> + r = (rgb565 >> 8) & 0xf8;
> + g = (rgb565 >> 3) & 0xfc;
> + b = (rgb565 << 3) & 0xf8;
> +#else
> + b = (rgb565 >> 8) & 0xf8;
> + g = (rgb565 >> 3) & 0xfc;
> + r = (rgb565 << 3) & 0xf8;
> +#endif
> *(PIXEL_TYPE *)d = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);
> s += 2;
> d += BPP;
> @@ -80,15 +86,14 @@ static void glue(draw_line32_, PIXEL_NAME)(
> uint8_t r, g, b;
>
> do {
> - ldub_p(s);
> #if defined(TARGET_WORDS_BIGENDIAN)
> + r = s[0];
> + g = s[1];
> + b = s[2];
> +#else
> r = s[1];
> g = s[2];
> b = s[3];
> -#else
> - b = s[0];
> - g = s[1];
> - r = s[2];
> #endif
This looks really suspicious. Previously we had
TARGET_WORDS_BIGENDIAN -> bytes are XRGB
otherwise bytes are BGRX
Now we have
TARGET_WORDS_BIGENDIAN -> bytes are RGBX
otherwise -> bytes are XRGB
That doesn't seem very plausible at all.
> *(PIXEL_TYPE *)d = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);
> s += 4;
> @@ -103,7 +108,7 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(SM501State
> *s, int crt,
> uint8_t *palette, int c_y, uint8_t *d, int width)
> {
> int x, i;
> - uint8_t *pixval, bitset = 0;
> + uint8_t *pixval, r, g, b, bitset = 0;
>
> /* get hardware cursor pattern */
> uint32_t cursor_addr = get_hwc_address(s, crt);
> @@ -129,9 +134,9 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(SM501State
> *s, int crt,
> /* write pixel */
> if (v) {
> v--;
> - uint8_t r = palette[v * 3 + 0];
> - uint8_t g = palette[v * 3 + 1];
> - uint8_t b = palette[v * 3 + 2];
> + r = palette[v * 3 + 0];
> + g = palette[v * 3 + 1];
> + b = palette[v * 3 + 2];
> *(PIXEL_TYPE *)d = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);
> }
> d += BPP;
This doesn't seem to be related to the rest of this patch?
thanks
-- PMM
