Commit d2e043a8 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Gerd Hoffmann
Browse files

vga: Remove remainder of old conversion cruft 



All the macros used to generate different versions of vga_template.h
are now unnecessary, take them all out and remove the _32 suffix from
most functions.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 9e057c0b

hw/display/vga.c

+22 −24
Original line number Diff line number Diff line
@@ -1009,10 +1009,8 @@ void vga_mem_writeb(VGACommonState *s, hwaddr addr, uint32_t val) 
typedef void vga_draw_line_func(VGACommonState *s1, uint8_t *d,

                                const uint8_t *s, int width);



#define DEPTH 32

#include "vga_template.h"





static unsigned int rgb_to_pixel32_dup(unsigned int r, unsigned int g, unsigned b)

{

    unsigned int col;
@@ -1311,10 +1309,10 @@ static void vga_draw_text(VGACommonState *s, int full_update) 
                bgcol = palette[cattr >> 4];

                fgcol = palette[cattr & 0x0f];

                if (cw == 16) {

                    vga_draw_glyph16_32(d1, linesize,

                    vga_draw_glyph16(d1, linesize,

                                     font_ptr, cheight, fgcol, bgcol);

                } else if (cw != 9) {

                    vga_draw_glyph8_32(d1, linesize,

                    vga_draw_glyph8(d1, linesize,

                                    font_ptr, cheight, fgcol, bgcol);

                } else {

                    dup9 = 0;
@@ -1322,7 +1320,7 @@ static void vga_draw_text(VGACommonState *s, int full_update) 
                        (s->ar[VGA_ATC_MODE] & 0x04)) {

                        dup9 = 1;

                    }

                    vga_draw_glyph9_32(d1, linesize,

                    vga_draw_glyph9(d1, linesize,

                                    font_ptr, cheight, fgcol, bgcol, dup9);

                }

                if (src == cursor_ptr &&
@@ -1339,13 +1337,13 @@ static void vga_draw_text(VGACommonState *s, int full_update) 
                        h = line_last - line_start + 1;

                        d = d1 + linesize * line_start;

                        if (cw == 16) {

                            vga_draw_glyph16_32(d, linesize,

                            vga_draw_glyph16(d, linesize,

                                             cursor_glyph, h, fgcol, bgcol);

                        } else if (cw != 9) {

                            vga_draw_glyph8_32(d, linesize,

                            vga_draw_glyph8(d, linesize,

                                            cursor_glyph, h, fgcol, bgcol);

                        } else {

                            vga_draw_glyph9_32(d, linesize,

                            vga_draw_glyph9(d, linesize,

                                            cursor_glyph, h, fgcol, bgcol, 1);

                        }

                    }
@@ -1384,16 +1382,16 @@ enum { 
};



static vga_draw_line_func * const vga_draw_line_table[VGA_DRAW_LINE_NB] = {

    vga_draw_line2_32,

    vga_draw_line2d2_32,

    vga_draw_line4_32,

    vga_draw_line4d2_32,

    vga_draw_line8d2_32,

    vga_draw_line8_32,

    vga_draw_line15_32,

    vga_draw_line16_32,

    vga_draw_line24_32,

    vga_draw_line32_32,

    vga_draw_line2,

    vga_draw_line2d2,

    vga_draw_line4,

    vga_draw_line4d2,

    vga_draw_line8d2,

    vga_draw_line8,

    vga_draw_line15,

    vga_draw_line16,

    vga_draw_line24,

    vga_draw_line32,

};



static int vga_get_bpp(VGACommonState *s)

hw/display/vga_template.h

+73 −154
Original line number Diff line number Diff line
@@ -22,41 +22,9 @@ 
 * THE SOFTWARE.

 */



#if DEPTH == 8

#define BPP 1

#define PIXEL_TYPE uint8_t

#elif DEPTH == 15 || DEPTH == 16

#define BPP 2

#define PIXEL_TYPE uint16_t

#elif DEPTH == 32

#define BPP 4

#define PIXEL_TYPE uint32_t

#else

#error unsupport depth

#endif



#ifdef BGR_FORMAT

#define PIXEL_NAME glue(DEPTH, bgr)

#else

#define PIXEL_NAME DEPTH

#endif /* BGR_FORMAT */



#if DEPTH != 15 && !defined(BGR_FORMAT)



static inline void glue(vga_draw_glyph_line_, DEPTH)(uint8_t *d,

                                                     uint32_t font_data,

                                                     uint32_t xorcol,

                                                     uint32_t bgcol)

static inline void vga_draw_glyph_line(uint8_t *d, uint32_t font_data,

                                       uint32_t xorcol, uint32_t bgcol)

{

#if BPP == 1

        ((uint32_t *)d)[0] = (dmask16[(font_data >> 4)] & xorcol) ^ bgcol;

        ((uint32_t *)d)[1] = (dmask16[(font_data >> 0) & 0xf] & xorcol) ^ bgcol;

#elif BPP == 2

        ((uint32_t *)d)[0] = (dmask4[(font_data >> 6)] & xorcol) ^ bgcol;

        ((uint32_t *)d)[1] = (dmask4[(font_data >> 4) & 3] & xorcol) ^ bgcol;

        ((uint32_t *)d)[2] = (dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol;

        ((uint32_t *)d)[3] = (dmask4[(font_data >> 0) & 3] & xorcol) ^ bgcol;

#else

        ((uint32_t *)d)[0] = (-((font_data >> 7)) & xorcol) ^ bgcol;

        ((uint32_t *)d)[1] = (-((font_data >> 6) & 1) & xorcol) ^ bgcol;

        ((uint32_t *)d)[2] = (-((font_data >> 5) & 1) & xorcol) ^ bgcol;
@@ -65,10 +33,9 @@ static inline void glue(vga_draw_glyph_line_, DEPTH)(uint8_t *d, 
        ((uint32_t *)d)[5] = (-((font_data >> 2) & 1) & xorcol) ^ bgcol;

        ((uint32_t *)d)[6] = (-((font_data >> 1) & 1) & xorcol) ^ bgcol;

        ((uint32_t *)d)[7] = (-((font_data >> 0) & 1) & xorcol) ^ bgcol;

#endif

}



static void glue(vga_draw_glyph8_, DEPTH)(uint8_t *d, int linesize,

static void vga_draw_glyph8(uint8_t *d, int linesize,

                            const uint8_t *font_ptr, int h,

                            uint32_t fgcol, uint32_t bgcol)

{
@@ -77,13 +44,13 @@ static void glue(vga_draw_glyph8_, DEPTH)(uint8_t *d, int linesize, 
    xorcol = bgcol ^ fgcol;

    do {

        font_data = font_ptr[0];

        glue(vga_draw_glyph_line_, DEPTH)(d, font_data, xorcol, bgcol);

        vga_draw_glyph_line(d, font_data, xorcol, bgcol);

        font_ptr += 4;

        d += linesize;

    } while (--h);

}



static void glue(vga_draw_glyph16_, DEPTH)(uint8_t *d, int linesize,

static void vga_draw_glyph16(uint8_t *d, int linesize,

                                          const uint8_t *font_ptr, int h,

                                          uint32_t fgcol, uint32_t bgcol)

{
@@ -92,18 +59,16 @@ static void glue(vga_draw_glyph16_, DEPTH)(uint8_t *d, int linesize, 
    xorcol = bgcol ^ fgcol;

    do {

        font_data = font_ptr[0];

        glue(vga_draw_glyph_line_, DEPTH)(d,

                                          expand4to8[font_data >> 4],

        vga_draw_glyph_line(d, expand4to8[font_data >> 4],

                            xorcol, bgcol);

        glue(vga_draw_glyph_line_, DEPTH)(d + 8 * BPP,

                                          expand4to8[font_data & 0x0f],

        vga_draw_glyph_line(d + 32, expand4to8[font_data & 0x0f],

                            xorcol, bgcol);

        font_ptr += 4;

        d += linesize;

    } while (--h);

}



static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize,

static void vga_draw_glyph9(uint8_t *d, int linesize,

                            const uint8_t *font_ptr, int h,

                            uint32_t fgcol, uint32_t bgcol, int dup9)

{
@@ -112,28 +77,6 @@ static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize, 
    xorcol = bgcol ^ fgcol;

    do {

        font_data = font_ptr[0];

#if BPP == 1

        stl_p((uint32_t *)d, (dmask16[(font_data >> 4)] & xorcol) ^ bgcol);

        v = (dmask16[(font_data >> 0) & 0xf] & xorcol) ^ bgcol;

        stl_p(((uint32_t *)d)+1, v);

        if (dup9)

            ((uint8_t *)d)[8] = v >> (24 * (1 - BIG));

        else

            ((uint8_t *)d)[8] = bgcol;



#elif BPP == 2

        stl_p(((uint32_t *)d)+0, (dmask4[(font_data >> 6)] & xorcol) ^ bgcol);

        stl_p(((uint32_t *)d)+1,

              (dmask4[(font_data >> 4) & 3] & xorcol) ^ bgcol);

        stl_p(((uint32_t *)d)+2,

              (dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol);

        v = (dmask4[(font_data >> 0) & 3] & xorcol) ^ bgcol;

        stl_p(((uint32_t *)d)+3, v);

        if (dup9)

            ((uint16_t *)d)[8] = v >> (16 * (1 - BIG));

        else

            ((uint16_t *)d)[8] = bgcol;

#else

        ((uint32_t *)d)[0] = (-((font_data >> 7)) & xorcol) ^ bgcol;

        ((uint32_t *)d)[1] = (-((font_data >> 6) & 1) & xorcol) ^ bgcol;

        ((uint32_t *)d)[2] = (-((font_data >> 5) & 1) & xorcol) ^ bgcol;
@@ -147,7 +90,6 @@ static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize, 
            ((uint32_t *)d)[8] = v;

        else

            ((uint32_t *)d)[8] = bgcol;

#endif

        font_ptr += 4;

        d += linesize;

    } while (--h);
@@ -156,7 +98,7 @@ static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize, 
/*

 * 4 color mode

 */

static void glue(vga_draw_line2_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line2(VGACommonState *s1, uint8_t *d,

                           const uint8_t *s, int width)

{

    uint32_t plane_mask, *palette, data, v;
@@ -170,35 +112,29 @@ static void glue(vga_draw_line2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
        data &= plane_mask;

        v = expand2[GET_PLANE(data, 0)];

        v |= expand2[GET_PLANE(data, 2)] << 2;

        ((PIXEL_TYPE *)d)[0] = palette[v >> 12];

        ((PIXEL_TYPE *)d)[1] = palette[(v >> 8) & 0xf];

        ((PIXEL_TYPE *)d)[2] = palette[(v >> 4) & 0xf];

        ((PIXEL_TYPE *)d)[3] = palette[(v >> 0) & 0xf];

        ((uint32_t *)d)[0] = palette[v >> 12];

        ((uint32_t *)d)[1] = palette[(v >> 8) & 0xf];

        ((uint32_t *)d)[2] = palette[(v >> 4) & 0xf];

        ((uint32_t *)d)[3] = palette[(v >> 0) & 0xf];



        v = expand2[GET_PLANE(data, 1)];

        v |= expand2[GET_PLANE(data, 3)] << 2;

        ((PIXEL_TYPE *)d)[4] = palette[v >> 12];

        ((PIXEL_TYPE *)d)[5] = palette[(v >> 8) & 0xf];

        ((PIXEL_TYPE *)d)[6] = palette[(v >> 4) & 0xf];

        ((PIXEL_TYPE *)d)[7] = palette[(v >> 0) & 0xf];

        d += BPP * 8;

        ((uint32_t *)d)[4] = palette[v >> 12];

        ((uint32_t *)d)[5] = palette[(v >> 8) & 0xf];

        ((uint32_t *)d)[6] = palette[(v >> 4) & 0xf];

        ((uint32_t *)d)[7] = palette[(v >> 0) & 0xf];

        d += 32;

        s += 4;

    }

}



#if BPP == 1

#define PUT_PIXEL2(d, n, v) ((uint16_t *)d)[(n)] = (v)

#elif BPP == 2

#define PUT_PIXEL2(d, n, v) ((uint32_t *)d)[(n)] = (v)

#else

#define PUT_PIXEL2(d, n, v) \

((uint32_t *)d)[2*(n)] = ((uint32_t *)d)[2*(n)+1] = (v)

#endif



/*

 * 4 color mode, dup2 horizontal

 */

static void glue(vga_draw_line2d2_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line2d2(VGACommonState *s1, uint8_t *d,

                             const uint8_t *s, int width)

{

    uint32_t plane_mask, *palette, data, v;
@@ -223,7 +159,7 @@ static void glue(vga_draw_line2d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
        PUT_PIXEL2(d, 5, palette[(v >> 8) & 0xf]);

        PUT_PIXEL2(d, 6, palette[(v >> 4) & 0xf]);

        PUT_PIXEL2(d, 7, palette[(v >> 0) & 0xf]);

        d += BPP * 16;

        d += 64;

        s += 4;

    }

}
@@ -231,7 +167,7 @@ static void glue(vga_draw_line2d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
/*

 * 16 color mode

 */

static void glue(vga_draw_line4_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line4(VGACommonState *s1, uint8_t *d,

                           const uint8_t *s, int width)

{

    uint32_t plane_mask, data, v, *palette;
@@ -247,15 +183,15 @@ static void glue(vga_draw_line4_, DEPTH)(VGACommonState *s1, uint8_t *d, 
        v |= expand4[GET_PLANE(data, 1)] << 1;

        v |= expand4[GET_PLANE(data, 2)] << 2;

        v |= expand4[GET_PLANE(data, 3)] << 3;

        ((PIXEL_TYPE *)d)[0] = palette[v >> 28];

        ((PIXEL_TYPE *)d)[1] = palette[(v >> 24) & 0xf];

        ((PIXEL_TYPE *)d)[2] = palette[(v >> 20) & 0xf];

        ((PIXEL_TYPE *)d)[3] = palette[(v >> 16) & 0xf];

        ((PIXEL_TYPE *)d)[4] = palette[(v >> 12) & 0xf];

        ((PIXEL_TYPE *)d)[5] = palette[(v >> 8) & 0xf];

        ((PIXEL_TYPE *)d)[6] = palette[(v >> 4) & 0xf];

        ((PIXEL_TYPE *)d)[7] = palette[(v >> 0) & 0xf];

        d += BPP * 8;

        ((uint32_t *)d)[0] = palette[v >> 28];

        ((uint32_t *)d)[1] = palette[(v >> 24) & 0xf];

        ((uint32_t *)d)[2] = palette[(v >> 20) & 0xf];

        ((uint32_t *)d)[3] = palette[(v >> 16) & 0xf];

        ((uint32_t *)d)[4] = palette[(v >> 12) & 0xf];

        ((uint32_t *)d)[5] = palette[(v >> 8) & 0xf];

        ((uint32_t *)d)[6] = palette[(v >> 4) & 0xf];

        ((uint32_t *)d)[7] = palette[(v >> 0) & 0xf];

        d += 32;

        s += 4;

    }

}
@@ -263,7 +199,7 @@ static void glue(vga_draw_line4_, DEPTH)(VGACommonState *s1, uint8_t *d, 
/*

 * 16 color mode, dup2 horizontal

 */

static void glue(vga_draw_line4d2_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line4d2(VGACommonState *s1, uint8_t *d,

                             const uint8_t *s, int width)

{

    uint32_t plane_mask, data, v, *palette;
@@ -287,7 +223,7 @@ static void glue(vga_draw_line4d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
        PUT_PIXEL2(d, 5, palette[(v >> 8) & 0xf]);

        PUT_PIXEL2(d, 6, palette[(v >> 4) & 0xf]);

        PUT_PIXEL2(d, 7, palette[(v >> 0) & 0xf]);

        d += BPP * 16;

        d += 64;

        s += 4;

    }

}
@@ -297,7 +233,7 @@ static void glue(vga_draw_line4d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
 *

 * XXX: add plane_mask support (never used in standard VGA modes)

 */

static void glue(vga_draw_line8d2_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line8d2(VGACommonState *s1, uint8_t *d,

                             const uint8_t *s, int width)

{

    uint32_t *palette;
@@ -310,7 +246,7 @@ static void glue(vga_draw_line8d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
        PUT_PIXEL2(d, 1, palette[s[1]]);

        PUT_PIXEL2(d, 2, palette[s[2]]);

        PUT_PIXEL2(d, 3, palette[s[3]]);

        d += BPP * 8;

        d += 32;

        s += 4;

    }

}
@@ -320,7 +256,7 @@ static void glue(vga_draw_line8d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
 *

 * XXX: add plane_mask support (never used in standard VGA modes)

 */

static void glue(vga_draw_line8_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line8(VGACommonState *s1, uint8_t *d,

                           const uint8_t *s, int width)

{

    uint32_t *palette;
@@ -329,33 +265,28 @@ static void glue(vga_draw_line8_, DEPTH)(VGACommonState *s1, uint8_t *d, 
    palette = s1->last_palette;

    width >>= 3;

    for(x = 0; x < width; x++) {

        ((PIXEL_TYPE *)d)[0] = palette[s[0]];

        ((PIXEL_TYPE *)d)[1] = palette[s[1]];

        ((PIXEL_TYPE *)d)[2] = palette[s[2]];

        ((PIXEL_TYPE *)d)[3] = palette[s[3]];

        ((PIXEL_TYPE *)d)[4] = palette[s[4]];

        ((PIXEL_TYPE *)d)[5] = palette[s[5]];

        ((PIXEL_TYPE *)d)[6] = palette[s[6]];

        ((PIXEL_TYPE *)d)[7] = palette[s[7]];

        d += BPP * 8;

        ((uint32_t *)d)[0] = palette[s[0]];

        ((uint32_t *)d)[1] = palette[s[1]];

        ((uint32_t *)d)[2] = palette[s[2]];

        ((uint32_t *)d)[3] = palette[s[3]];

        ((uint32_t *)d)[4] = palette[s[4]];

        ((uint32_t *)d)[5] = palette[s[5]];

        ((uint32_t *)d)[6] = palette[s[6]];

        ((uint32_t *)d)[7] = palette[s[7]];

        d += 32;

        s += 8;

    }

}



#endif /* DEPTH != 15 */





/* XXX: optimize */



/*

 * 15 bit color

 */

static void glue(vga_draw_line15_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line15(VGACommonState *s1, uint8_t *d,

                            const uint8_t *s, int width)

{

#if DEPTH == 15 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)

    memcpy(d, s, width * 2);

#else

    int w;

    uint32_t v, r, g, b;
@@ -365,22 +296,18 @@ static void glue(vga_draw_line15_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d, 
        r = (v >> 7) & 0xf8;

        g = (v >> 2) & 0xf8;

        b = (v << 3) & 0xf8;

        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 2;

        d += BPP;

        d += 4;

    } while (--w != 0);

#endif

}



/*

 * 16 bit color

 */

static void glue(vga_draw_line16_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line16(VGACommonState *s1, uint8_t *d,

                            const uint8_t *s, int width)

{

#if DEPTH == 16 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)

    memcpy(d, s, width * 2);

#else

    int w;

    uint32_t v, r, g, b;
@@ -390,17 +317,16 @@ static void glue(vga_draw_line16_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d, 
        r = (v >> 8) & 0xf8;

        g = (v >> 3) & 0xfc;

        b = (v << 3) & 0xf8;

        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 2;

        d += BPP;

        d += 4;

    } while (--w != 0);

#endif

}



/*

 * 24 bit color

 */

static void glue(vga_draw_line24_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line24(VGACommonState *s1, uint8_t *d,

                            const uint8_t *s, int width)

{

    int w;
@@ -417,19 +343,19 @@ static void glue(vga_draw_line24_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d, 
        g = s[1];

        r = s[2];

#endif

        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 3;

        d += BPP;

        d += 4;

    } while (--w != 0);

}



/*

 * 32 bit color

 */

static void glue(vga_draw_line32_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line32(VGACommonState *s1, uint8_t *d,

                            const uint8_t *s, int width)

{

#if DEPTH == 32 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) && !defined(BGR_FORMAT)

#if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)

    memcpy(d, s, width * 4);

#else

    int w;
@@ -446,16 +372,9 @@ static void glue(vga_draw_line32_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d, 
        g = s[1];

        r = s[2];

#endif

        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 4;

        d += BPP;

        d += 4;

    } while (--w != 0);

#endif

}
 


#undef PUT_PIXEL2

#undef DEPTH

#undef BPP

#undef PIXEL_TYPE

#undef PIXEL_NAME

#undef BGR_FORMAT