aboutsummaryrefslogtreecommitdiff
path: root/hw/display
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-02-11 14:15:08 +0000
committerPeter Maydell <peter.maydell@linaro.org>2021-03-14 13:14:55 +0000
commit560ebce6b2c54367e63757567230344c13999dc7 (patch)
treefea873c6c1de256cdc2f8db9aab6912baa114429 /hw/display
parent62bdc8c1646fe710c35f34d0b63a2b520807696c (diff)
downloadqemu-560ebce6b2c54367e63757567230344c13999dc7.zip
qemu-560ebce6b2c54367e63757567230344c13999dc7.tar.gz
qemu-560ebce6b2c54367e63757567230344c13999dc7.tar.bz2
hw/display/pl110: Pull included-once parts of template header into pl110.c
The pl110_template.h header has a doubly-nested multiple-include pattern: * pl110.c includes it once for each host bit depth (now always 32) * every time it is included, it includes itself 6 times, to account for multiple guest device pixel and byte orders Now we only have to deal with 32-bit host bit depths, we can move the code corresponding to the outer layer of this double-nesting to be directly in pl110.c and reduce the template header to a single layer of nesting. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20210211141515.8755-3-peter.maydell@linaro.org
Diffstat (limited to 'hw/display')
-rw-r--r--hw/display/pl110.c79
-rw-r--r--hw/display/pl110_template.h100
2 files changed, 80 insertions, 99 deletions
diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index a0d4126..ce30066 100644
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -124,7 +124,86 @@ static const unsigned char *idregs[] = {
};
#define BITS 32
+#define COPY_PIXEL(to, from) do { *(uint32_t *)to = from; to += 4; } while (0)
+
+#undef RGB
+#define BORDER bgr
+#define ORDER 0
+#include "pl110_template.h"
+#define ORDER 1
+#include "pl110_template.h"
+#define ORDER 2
+#include "pl110_template.h"
+#undef BORDER
+#define RGB
+#define BORDER rgb
+#define ORDER 0
+#include "pl110_template.h"
+#define ORDER 1
#include "pl110_template.h"
+#define ORDER 2
+#include "pl110_template.h"
+#undef BORDER
+
+static drawfn pl110_draw_fn_32[48] = {
+ pl110_draw_line1_lblp_bgr32,
+ pl110_draw_line2_lblp_bgr32,
+ pl110_draw_line4_lblp_bgr32,
+ pl110_draw_line8_lblp_bgr32,
+ pl110_draw_line16_555_lblp_bgr32,
+ pl110_draw_line32_lblp_bgr32,
+ pl110_draw_line16_lblp_bgr32,
+ pl110_draw_line12_lblp_bgr32,
+
+ pl110_draw_line1_bbbp_bgr32,
+ pl110_draw_line2_bbbp_bgr32,
+ pl110_draw_line4_bbbp_bgr32,
+ pl110_draw_line8_bbbp_bgr32,
+ pl110_draw_line16_555_bbbp_bgr32,
+ pl110_draw_line32_bbbp_bgr32,
+ pl110_draw_line16_bbbp_bgr32,
+ pl110_draw_line12_bbbp_bgr32,
+
+ pl110_draw_line1_lbbp_bgr32,
+ pl110_draw_line2_lbbp_bgr32,
+ pl110_draw_line4_lbbp_bgr32,
+ pl110_draw_line8_lbbp_bgr32,
+ pl110_draw_line16_555_lbbp_bgr32,
+ pl110_draw_line32_lbbp_bgr32,
+ pl110_draw_line16_lbbp_bgr32,
+ pl110_draw_line12_lbbp_bgr32,
+
+ pl110_draw_line1_lblp_rgb32,
+ pl110_draw_line2_lblp_rgb32,
+ pl110_draw_line4_lblp_rgb32,
+ pl110_draw_line8_lblp_rgb32,
+ pl110_draw_line16_555_lblp_rgb32,
+ pl110_draw_line32_lblp_rgb32,
+ pl110_draw_line16_lblp_rgb32,
+ pl110_draw_line12_lblp_rgb32,
+
+ pl110_draw_line1_bbbp_rgb32,
+ pl110_draw_line2_bbbp_rgb32,
+ pl110_draw_line4_bbbp_rgb32,
+ pl110_draw_line8_bbbp_rgb32,
+ pl110_draw_line16_555_bbbp_rgb32,
+ pl110_draw_line32_bbbp_rgb32,
+ pl110_draw_line16_bbbp_rgb32,
+ pl110_draw_line12_bbbp_rgb32,
+
+ pl110_draw_line1_lbbp_rgb32,
+ pl110_draw_line2_lbbp_rgb32,
+ pl110_draw_line4_lbbp_rgb32,
+ pl110_draw_line8_lbbp_rgb32,
+ pl110_draw_line16_555_lbbp_rgb32,
+ pl110_draw_line32_lbbp_rgb32,
+ pl110_draw_line16_lbbp_rgb32,
+ pl110_draw_line12_lbbp_rgb32,
+};
+
+#undef BITS
+#undef COPY_PIXEL
+
static int pl110_enabled(PL110State *s)
{
diff --git a/hw/display/pl110_template.h b/hw/display/pl110_template.h
index 36ba791..0d8471d 100644
--- a/hw/display/pl110_template.h
+++ b/hw/display/pl110_template.h
@@ -10,105 +10,9 @@
*/
#ifndef ORDER
-
-#if BITS == 8
-#define COPY_PIXEL(to, from) *(to++) = from
-#elif BITS == 15 || BITS == 16
-#define COPY_PIXEL(to, from) do { *(uint16_t *)to = from; to += 2; } while (0)
-#elif BITS == 24
-#define COPY_PIXEL(to, from) \
- do { \
- *(to++) = from; \
- *(to++) = (from) >> 8; \
- *(to++) = (from) >> 16; \
- } while (0)
-#elif BITS == 32
-#define COPY_PIXEL(to, from) do { *(uint32_t *)to = from; to += 4; } while (0)
-#else
-#error unknown bit depth
+#error "pl110_template.h is only for inclusion by pl110.c"
#endif
-#undef RGB
-#define BORDER bgr
-#define ORDER 0
-#include "pl110_template.h"
-#define ORDER 1
-#include "pl110_template.h"
-#define ORDER 2
-#include "pl110_template.h"
-#undef BORDER
-#define RGB
-#define BORDER rgb
-#define ORDER 0
-#include "pl110_template.h"
-#define ORDER 1
-#include "pl110_template.h"
-#define ORDER 2
-#include "pl110_template.h"
-#undef BORDER
-
-static drawfn glue(pl110_draw_fn_,BITS)[48] =
-{
- glue(pl110_draw_line1_lblp_bgr,BITS),
- glue(pl110_draw_line2_lblp_bgr,BITS),
- glue(pl110_draw_line4_lblp_bgr,BITS),
- glue(pl110_draw_line8_lblp_bgr,BITS),
- glue(pl110_draw_line16_555_lblp_bgr,BITS),
- glue(pl110_draw_line32_lblp_bgr,BITS),
- glue(pl110_draw_line16_lblp_bgr,BITS),
- glue(pl110_draw_line12_lblp_bgr,BITS),
-
- glue(pl110_draw_line1_bbbp_bgr,BITS),
- glue(pl110_draw_line2_bbbp_bgr,BITS),
- glue(pl110_draw_line4_bbbp_bgr,BITS),
- glue(pl110_draw_line8_bbbp_bgr,BITS),
- glue(pl110_draw_line16_555_bbbp_bgr,BITS),
- glue(pl110_draw_line32_bbbp_bgr,BITS),
- glue(pl110_draw_line16_bbbp_bgr,BITS),
- glue(pl110_draw_line12_bbbp_bgr,BITS),
-
- glue(pl110_draw_line1_lbbp_bgr,BITS),
- glue(pl110_draw_line2_lbbp_bgr,BITS),
- glue(pl110_draw_line4_lbbp_bgr,BITS),
- glue(pl110_draw_line8_lbbp_bgr,BITS),
- glue(pl110_draw_line16_555_lbbp_bgr,BITS),
- glue(pl110_draw_line32_lbbp_bgr,BITS),
- glue(pl110_draw_line16_lbbp_bgr,BITS),
- glue(pl110_draw_line12_lbbp_bgr,BITS),
-
- glue(pl110_draw_line1_lblp_rgb,BITS),
- glue(pl110_draw_line2_lblp_rgb,BITS),
- glue(pl110_draw_line4_lblp_rgb,BITS),
- glue(pl110_draw_line8_lblp_rgb,BITS),
- glue(pl110_draw_line16_555_lblp_rgb,BITS),
- glue(pl110_draw_line32_lblp_rgb,BITS),
- glue(pl110_draw_line16_lblp_rgb,BITS),
- glue(pl110_draw_line12_lblp_rgb,BITS),
-
- glue(pl110_draw_line1_bbbp_rgb,BITS),
- glue(pl110_draw_line2_bbbp_rgb,BITS),
- glue(pl110_draw_line4_bbbp_rgb,BITS),
- glue(pl110_draw_line8_bbbp_rgb,BITS),
- glue(pl110_draw_line16_555_bbbp_rgb,BITS),
- glue(pl110_draw_line32_bbbp_rgb,BITS),
- glue(pl110_draw_line16_bbbp_rgb,BITS),
- glue(pl110_draw_line12_bbbp_rgb,BITS),
-
- glue(pl110_draw_line1_lbbp_rgb,BITS),
- glue(pl110_draw_line2_lbbp_rgb,BITS),
- glue(pl110_draw_line4_lbbp_rgb,BITS),
- glue(pl110_draw_line8_lbbp_rgb,BITS),
- glue(pl110_draw_line16_555_lbbp_rgb,BITS),
- glue(pl110_draw_line32_lbbp_rgb,BITS),
- glue(pl110_draw_line16_lbbp_rgb,BITS),
- glue(pl110_draw_line12_lbbp_rgb,BITS),
-};
-
-#undef BITS
-#undef COPY_PIXEL
-
-#else
-
#if ORDER == 0
#define NAME glue(glue(lblp_, BORDER), BITS)
#ifdef HOST_WORDS_BIGENDIAN
@@ -395,5 +299,3 @@ static void glue(pl110_draw_line12_,NAME)(void *opaque, uint8_t *d, const uint8_
#undef NAME
#undef SWAP_WORDS
#undef ORDER
-
-#endif