From b97bdaf62f567d661feaf69662cb176e43ceba60 Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Thu, 5 Oct 2017 14:51:18 +0200

Subject: [PATCH 22/27] vga: Rename vga_template.h to vga-helpers.h

RH-Author: Gerd Hoffmann <kraxel@redhat.com>

Message-id: <20171005145119.15277-7-kraxel@redhat.com>

Patchwork-id: 76822

O-Subject: [RHEL-7.5 qemu-kvm PATCH 6/7] vga: Rename vga_template.h to vga-helpers.h

Bugzilla: 1486642

RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

It's no longer a template, we only instanciate the file once.

Keep it a #included file so the functions remain static.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

(cherry picked from commit e657d8ef3c810c4c46d3a61bb76103f77bdb499b)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/display/vga-helpers.h  | 439 ++++++++++++++++++++++++++++++++++++++++++++++

 hw/display/vga.c          |   2 +-

 hw/display/vga_template.h | 439 ----------------------------------------------

 3 files changed, 440 insertions(+), 440 deletions(-)

 create mode 100644 hw/display/vga-helpers.h

 delete mode 100644 hw/display/vga_template.h

diff --git a/hw/display/vga-helpers.h b/hw/display/vga-helpers.h

new file mode 100644

index 0000000..94f6de2

--- /dev/null

+++ b/hw/display/vga-helpers.h

@@ -0,0 +1,439 @@

+/*

+ * QEMU VGA Emulator templates

+ *

+ * Copyright (c) 2003 Fabrice Bellard

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy

+ * of this software and associated documentation files (the "Software"), to deal

+ * in the Software without restriction, including without limitation the rights

+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+ * copies of the Software, and to permit persons to whom the Software is

+ * furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+ * THE SOFTWARE.

+ */

+

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

+                                       uint32_t xorcol, uint32_t bgcol)

+{

+        ((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;

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

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

+        ((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;

+}

+

+static void vga_draw_glyph8(uint8_t *d, int linesize,

+                            const uint8_t *font_ptr, int h,

+                            uint32_t fgcol, uint32_t bgcol)

+{

+    uint32_t font_data, xorcol;

+

+    xorcol = bgcol ^ fgcol;

+    do {

+        font_data = font_ptr[0];

+        vga_draw_glyph_line(d, font_data, xorcol, bgcol);

+        font_ptr += 4;

+        d += linesize;

+    } while (--h);

+}

+

+static void vga_draw_glyph16(uint8_t *d, int linesize,

+                                          const uint8_t *font_ptr, int h,

+                                          uint32_t fgcol, uint32_t bgcol)

+{

+    uint32_t font_data, xorcol;

+

+    xorcol = bgcol ^ fgcol;

+    do {

+        font_data = font_ptr[0];

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

+                            xorcol, bgcol);

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

+                            xorcol, bgcol);

+        font_ptr += 4;

+        d += linesize;

+    } while (--h);

+}

+

+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)

+{

+    uint32_t font_data, xorcol, v;

+

+    xorcol = bgcol ^ fgcol;

+    do {

+        font_data = font_ptr[0];

+        ((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;

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

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

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

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

+        v = (-((font_data >> 0) & 1) & xorcol) ^ bgcol;

+        ((uint32_t *)d)[7] = v;

+        if (dup9)

+            ((uint32_t *)d)[8] = v;

+        else

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

+        font_ptr += 4;

+        d += linesize;

+    } while (--h);

+}

+

+/*

+ * 4 color mode

+ */

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

+                           const uint8_t *s, int width)

+{

+    uint32_t plane_mask, *palette, data, v;

+    int x;

+

+    palette = s1->last_palette;

+    plane_mask = mask16[s1->ar[VGA_ATC_PLANE_ENABLE] & 0xf];

+    width >>= 3;

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

+        data = ((uint32_t *)s)[0];

+        data &= plane_mask;

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

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

+        ((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;

+        ((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;

+    }

+}

+

+#define PUT_PIXEL2(d, n, v) \

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

+

+/*

+ * 4 color mode, dup2 horizontal

+ */

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

+                             const uint8_t *s, int width)

+{

+    uint32_t plane_mask, *palette, data, v;

+    int x;

+

+    palette = s1->last_palette;

+    plane_mask = mask16[s1->ar[VGA_ATC_PLANE_ENABLE] & 0xf];

+    width >>= 3;

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

+        data = ((uint32_t *)s)[0];

+        data &= plane_mask;

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

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

+        PUT_PIXEL2(d, 0, palette[v >> 12]);

+        PUT_PIXEL2(d, 1, palette[(v >> 8) & 0xf]);

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

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

+

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

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

+        PUT_PIXEL2(d, 4, palette[v >> 12]);

+        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 += 64;

+        s += 4;

+    }

+}

+

+/*

+ * 16 color mode

+ */

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

+                           const uint8_t *s, int width)

+{

+    uint32_t plane_mask, data, v, *palette;

+    int x;

+

+    palette = s1->last_palette;

+    plane_mask = mask16[s1->ar[VGA_ATC_PLANE_ENABLE] & 0xf];

+    width >>= 3;

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

+        data = ((uint32_t *)s)[0];

+        data &= plane_mask;

+        v = expand4[GET_PLANE(data, 0)];

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

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

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

+        ((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;

+    }

+}

+

+/*

+ * 16 color mode, dup2 horizontal

+ */

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

+                             const uint8_t *s, int width)

+{

+    uint32_t plane_mask, data, v, *palette;

+    int x;

+

+    palette = s1->last_palette;

+    plane_mask = mask16[s1->ar[VGA_ATC_PLANE_ENABLE] & 0xf];

+    width >>= 3;

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

+        data = ((uint32_t *)s)[0];

+        data &= plane_mask;

+        v = expand4[GET_PLANE(data, 0)];

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

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

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

+        PUT_PIXEL2(d, 0, palette[v >> 28]);

+        PUT_PIXEL2(d, 1, palette[(v >> 24) & 0xf]);

+        PUT_PIXEL2(d, 2, palette[(v >> 20) & 0xf]);

+        PUT_PIXEL2(d, 3, palette[(v >> 16) & 0xf]);

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

+        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 += 64;

+        s += 4;

+    }

+}

+

+/*

+ * 256 color mode, double pixels

+ *

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

+ */

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

+                             const uint8_t *s, int width)

+{

+    uint32_t *palette;

+    int x;

+

+    palette = s1->last_palette;

+    width >>= 3;

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

+        PUT_PIXEL2(d, 0, palette[s[0]]);

+        PUT_PIXEL2(d, 1, palette[s[1]]);

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

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

+        d += 32;

+        s += 4;

+    }

+}

+

+/*

+ * standard 256 color mode

+ *

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

+ */

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

+                           const uint8_t *s, int width)

+{

+    uint32_t *palette;

+    int x;

+

+    palette = s1->last_palette;

+    width >>= 3;

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

+        ((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;

+    }

+}

+

+/*

+ * 15 bit color

+ */

+static void vga_draw_line15_le(VGACommonState *s1, uint8_t *d,

+                               const uint8_t *s, int width)

+{

+    int w;

+    uint32_t v, r, g, b;

+

+    w = width;

+    do {

+        v = lduw_le_p((void *)s);

+        r = (v >> 7) & 0xf8;

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

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

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

+        s += 2;

+        d += 4;

+    } while (--w != 0);

+}

+

+static void vga_draw_line15_be(VGACommonState *s1, uint8_t *d,

+                               const uint8_t *s, int width)

+{

+    int w;

+    uint32_t v, r, g, b;

+

+    w = width;

+    do {

+        v = lduw_be_p((void *)s);

+        r = (v >> 7) & 0xf8;

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

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

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

+        s += 2;

+        d += 4;

+    } while (--w != 0);

+}

+

+/*

+ * 16 bit color

+ */

+static void vga_draw_line16_le(VGACommonState *s1, uint8_t *d,

+                               const uint8_t *s, int width)

+{

+    int w;

+    uint32_t v, r, g, b;

+

+    w = width;

+    do {

+        v = lduw_le_p((void *)s);

+        r = (v >> 8) & 0xf8;

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

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

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

+        s += 2;

+        d += 4;

+    } while (--w != 0);

+}

+

+static void vga_draw_line16_be(VGACommonState *s1, uint8_t *d,

+                               const uint8_t *s, int width)

+{

+    int w;

+    uint32_t v, r, g, b;

+

+    w = width;

+    do {

+        v = lduw_be_p((void *)s);

+        r = (v >> 8) & 0xf8;

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

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

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

+        s += 2;

+        d += 4;

+    } while (--w != 0);

+}

+

+/*

+ * 24 bit color

+ */

+static void vga_draw_line24_le(VGACommonState *s1, uint8_t *d,

+                               const uint8_t *s, int width)

+{

+    int w;

+    uint32_t r, g, b;

+

+    w = width;

+    do {

+        b = s[0];

+        g = s[1];

+        r = s[2];

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

+        s += 3;

+        d += 4;

+    } while (--w != 0);

+}

+

+static void vga_draw_line24_be(VGACommonState *s1, uint8_t *d,

+                               const uint8_t *s, int width)

+{

+    int w;

+    uint32_t r, g, b;

+

+    w = width;

+    do {

+        r = s[0];

+        g = s[1];

+        b = s[2];

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

+        s += 3;

+        d += 4;

+    } while (--w != 0);

+}

+

+/*

+ * 32 bit color

+ */

+static void vga_draw_line32_le(VGACommonState *s1, uint8_t *d,

+                               const uint8_t *s, int width)

+{

+#ifndef HOST_WORDS_BIGENDIAN

+    memcpy(d, s, width * 4);

+#else

+    int w;

+    uint32_t r, g, b;

+

+    w = width;

+    do {

+        b = s[0];

+        g = s[1];

+        r = s[2];

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

+        s += 4;

+        d += 4;

+    } while (--w != 0);

+#endif

+}

+

+static void vga_draw_line32_be(VGACommonState *s1, uint8_t *d,

+                               const uint8_t *s, int width)

+{

+#ifdef HOST_WORDS_BIGENDIAN

+    memcpy(d, s, width * 4);

+#else

+    int w;

+    uint32_t r, g, b;

+

+    w = width;

+    do {

+        r = s[1];

+        g = s[2];

+        b = s[3];

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

+        s += 4;

+        d += 4;

+    } while (--w != 0);

+#endif

+}

diff --git a/hw/display/vga.c b/hw/display/vga.c

index 50999ee..4618823 100644

--- a/hw/display/vga.c

+++ b/hw/display/vga.c

@@ -1047,7 +1047,7 @@ 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);

-#include "vga_template.h"

+#include "vga-helpers.h"

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

 {

diff --git a/hw/display/vga_template.h b/hw/display/vga_template.h

deleted file mode 100644

index 94f6de2..0000000

--- a/hw/display/vga_template.h

+++ /dev/null

@@ -1,439 +0,0 @@

-/*

- * QEMU VGA Emulator templates

- *

- * Copyright (c) 2003 Fabrice Bellard

- *

- * Permission is hereby granted, free of charge, to any person obtaining a copy

- * of this software and associated documentation files (the "Software"), to deal

- * in the Software without restriction, including without limitation the rights

- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- * copies of the Software, and to permit persons to whom the Software is

- * furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

- * THE SOFTWARE.

- */

-

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

-                                       uint32_t xorcol, uint32_t bgcol)

-{

-        ((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;

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

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

-        ((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;

-}

-

-static void vga_draw_glyph8(uint8_t *d, int linesize,

-                            const uint8_t *font_ptr, int h,

-                            uint32_t fgcol, uint32_t bgcol)

-{

-    uint32_t font_data, xorcol;

-

-    xorcol = bgcol ^ fgcol;

-    do {

-        font_data = font_ptr[0];

-        vga_draw_glyph_line(d, font_data, xorcol, bgcol);

-        font_ptr += 4;

-        d += linesize;

-    } while (--h);

-}

-

-static void vga_draw_glyph16(uint8_t *d, int linesize,

-                                          const uint8_t *font_ptr, int h,

-                                          uint32_t fgcol, uint32_t bgcol)

-{

-    uint32_t font_data, xorcol;

-

-    xorcol = bgcol ^ fgcol;

-    do {

-        font_data = font_ptr[0];

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

-                            xorcol, bgcol);

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

-                            xorcol, bgcol);

-        font_ptr += 4;

-        d += linesize;

-    } while (--h);

-}

-

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

-{

-    uint32_t font_data, xorcol, v;

-

-    xorcol = bgcol ^ fgcol;

-    do {

-        font_data = font_ptr[0];

-        ((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;

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

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

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

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

-        v = (-((font_data >> 0) & 1) & xorcol) ^ bgcol;

-        ((uint32_t *)d)[7] = v;

-        if (dup9)

-            ((uint32_t *)d)[8] = v;

-        else

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

-        font_ptr += 4;

-        d += linesize;

-    } while (--h);

-}

-

-/*

- * 4 color mode

- */

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

-                           const uint8_t *s, int width)

-{

-    uint32_t plane_mask, *palette, data, v;

-    int x;

-

-    palette = s1->last_palette;

-    plane_mask = mask16[s1->ar[VGA_ATC_PLANE_ENABLE] & 0xf];

-    width >>= 3;

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

-        data = ((uint32_t *)s)[0];

-        data &= plane_mask;

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

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

-        ((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;

-        ((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;

-    }

-}

-

-#define PUT_PIXEL2(d, n, v) \

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

-

-/*

- * 4 color mode, dup2 horizontal

- */

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

-                             const uint8_t *s, int width)

-{

-    uint32_t plane_mask, *palette, data, v;

-    int x;

-

-    palette = s1->last_palette;

-    plane_mask = mask16[s1->ar[VGA_ATC_PLANE_ENABLE] & 0xf];

-    width >>= 3;

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

-        data = ((uint32_t *)s)[0];

-        data &= plane_mask;

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

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

-        PUT_PIXEL2(d, 0, palette[v >> 12]);

-        PUT_PIXEL2(d, 1, palette[(v >> 8) & 0xf]);

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

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

-

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

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

-        PUT_PIXEL2(d, 4, palette[v >> 12]);

-        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 += 64;

-        s += 4;

-    }

-}

-

-/*

- * 16 color mode

- */

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

-                           const uint8_t *s, int width)

-{

-    uint32_t plane_mask, data, v, *palette;

-    int x;

-

-    palette = s1->last_palette;

-    plane_mask = mask16[s1->ar[VGA_ATC_PLANE_ENABLE] & 0xf];

-    width >>= 3;

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

-        data = ((uint32_t *)s)[0];

-        data &= plane_mask;

-        v = expand4[GET_PLANE(data, 0)];

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

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

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

-        ((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;

-    }

-}

-

-/*

- * 16 color mode, dup2 horizontal

- */

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

-                             const uint8_t *s, int width)

-{

-    uint32_t plane_mask, data, v, *palette;

-    int x;

-

-    palette = s1->last_palette;

-    plane_mask = mask16[s1->ar[VGA_ATC_PLANE_ENABLE] & 0xf];

-    width >>= 3;

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

-        data = ((uint32_t *)s)[0];

-        data &= plane_mask;

-        v = expand4[GET_PLANE(data, 0)];

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

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

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

-        PUT_PIXEL2(d, 0, palette[v >> 28]);

-        PUT_PIXEL2(d, 1, palette[(v >> 24) & 0xf]);

-        PUT_PIXEL2(d, 2, palette[(v >> 20) & 0xf]);

-        PUT_PIXEL2(d, 3, palette[(v >> 16) & 0xf]);

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