From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH 2/9] hw/display/pl110: Pull included-once parts of template header into pl110.c
Date: Thu, 11 Feb 2021 14:15:08 +0000 [thread overview]
Message-ID: <20210211141515.8755-3-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210211141515.8755-1-peter.maydell@linaro.org>
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>
---
hw/display/pl110_template.h | 100 +-----------------------------------
hw/display/pl110.c | 79 ++++++++++++++++++++++++++++
2 files changed, 80 insertions(+), 99 deletions(-)
diff --git a/hw/display/pl110_template.h b/hw/display/pl110_template.h
index 36ba791c6fd..0d8471db636 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
diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index a0d4126ce7f..ce300662e8b 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)
{
--
2.20.1
next prev parent reply other threads:[~2021-02-11 14:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-11 14:15 [PATCH 0/9] hw/display/pl110, pxa2xx_lcd: Tidy up template headers Peter Maydell
2021-02-11 14:15 ` [PATCH 1/9] hw/display/pl110: Remove dead code for non-32-bpp surfaces Peter Maydell
2021-02-11 14:15 ` Peter Maydell [this message]
2021-02-11 14:15 ` [PATCH 3/9] hw/display/pl110: Remove use of BITS from pl110_template.h Peter Maydell
2021-02-11 14:15 ` [PATCH 4/9] hw/display/pxa2xx_lcd: Remove dead code for non-32-bpp surfaces Peter Maydell
2021-02-11 14:15 ` [PATCH 5/9] hw/display/pxa2xx_lcd: Remove dest_width state field Peter Maydell
2021-02-11 14:15 ` [PATCH 6/9] hw/display/pxa2xx: Remove use of BITS in pxa2xx_template.h Peter Maydell
2021-02-11 14:15 ` [PATCH 7/9] hw/display/pxa2xx: Apply brace-related coding style fixes to template header Peter Maydell
2021-02-11 14:15 ` [PATCH 8/9] hw/display/pxa2xx: Apply whitespace-only " Peter Maydell
2021-02-11 14:15 ` [PATCH 9/9] hw/display/pxa2xx: Inline " Peter Maydell
[not found] ` <14af0670-caaf-caf1-0b90-fb10c7db13b0@trusted-objects.com>
2021-02-15 15:09 ` Malfunctionning qemu-system-arm ? vincent Dupaquis
2021-03-09 14:19 ` Alistair Francis
2021-03-09 16:00 ` vincent Dupaquis
2021-03-09 14:37 ` Liviu Ionescu
2021-03-09 15:58 ` vincent Dupaquis
2021-03-09 16:07 ` Liviu Ionescu
2021-03-05 14:48 ` [PATCH 0/9] hw/display/pl110, pxa2xx_lcd: Tidy up template headers Peter Maydell
2021-03-09 10:34 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210211141515.8755-3-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=kraxel@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).