From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 028CAC433E0 for ; Thu, 11 Feb 2021 14:19:53 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 811BB64E92 for ; Thu, 11 Feb 2021 14:19:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 811BB64E92 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lACox-0003YV-HI for qemu-devel@archiver.kernel.org; Thu, 11 Feb 2021 09:19:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lACkv-0006XY-8o for qemu-devel@nongnu.org; Thu, 11 Feb 2021 09:15:45 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:50794) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lACkc-00074W-2J for qemu-devel@nongnu.org; Thu, 11 Feb 2021 09:15:37 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 190so5704531wmz.0 for ; Thu, 11 Feb 2021 06:15:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=og9KQQdUmxD32yR3FyUcwq5x901q0uWSRIkM9UH1rUs=; b=wL2Ok7XK8W1C9rWKvBjT9g1uX0m45O/j/RvQ3WD5ySc3MEUZz9XSjO8UTIdXE2l65K QMWwvHfWTWAFCKI8O0+j/9I8qrCwgrxDhj2XBbc5EoxND6oodxcloAAl24soB7aP3Zi4 m4XDGfEQBCQ/MG4KEQji4/iy4Cn3XdKCbElP6jlAl+dZcJFTofN+nK5l14mMMZzpAmXr XecpoTDgfrksoRE9j8BAJIKOmNC83X8EtyNTeGkYgFLKgUc8TEGniX3A/goJHiYzgivf HVxRxuS2hbNmssV+dPFdvLL1BWiPA/gSXEHeu583Qt4d/Iu26j8r4HoD83wyfUpLnpyF RWBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=og9KQQdUmxD32yR3FyUcwq5x901q0uWSRIkM9UH1rUs=; b=EsCITLU5wKjaWcVX+lLCOlNsOSrw50bVYIdQo3Bwg+kYtewR7VaReZ/OHXtmUomRK9 HubZDPwB1P3QvHiMuZjAsP4sXafG8yQr/UyxmMnsn+p9tYq4c3qlfEanzRWfeWxhauzG BjXKecKtckCEdE8AOGFuvHK8P6ksNQxQbXJC4YTDH3Y8atYZVN/+snOszm5zoVtmD+Q/ ND30AaiOQmrQ3yXrLc78kVaslF2SpVdtLk4hHck81jWFY9eyyHZ8P8250h6hnAOf2Nbi whfLZH2TQZr9hLeT+oomvQ/5XJNzZj9uilQ4myIsmy9aLADMVolx4zjmM+dM0LfJ8JfW alJA== X-Gm-Message-State: AOAM530ZplCM9h+f9Qi2/kyQJHfn+rOd2AcvI5iOis/W7cNLAf26A8Jc nROEJE+MprO0dkMeNad2UwLZVg== X-Google-Smtp-Source: ABdhPJzjkBdsmSYweO6HoBLsZWAbs5aLFClaSWrnXu3cduEnQ/P+mDhRk+GBPneMx+WgPxkdaB7WcA== X-Received: by 2002:a1c:c903:: with SMTP id f3mr5334787wmb.69.1613052920013; Thu, 11 Feb 2021 06:15:20 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id h13sm5223291wrv.20.2021.02.11.06.15.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Feb 2021 06:15:19 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 3/9] hw/display/pl110: Remove use of BITS from pl110_template.h Date: Thu, 11 Feb 2021 14:15:09 +0000 Message-Id: <20210211141515.8755-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210211141515.8755-1-peter.maydell@linaro.org> References: <20210211141515.8755-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" BITS is always 32, so remove all uses of it from the template header, by dropping the trailing '32' from the draw function names and not constructing the name of rgb_to_pixel32() via the glue() macro. Signed-off-by: Peter Maydell --- hw/display/pl110_template.h | 20 +++---- hw/display/pl110.c | 113 ++++++++++++++++++------------------ 2 files changed, 65 insertions(+), 68 deletions(-) diff --git a/hw/display/pl110_template.h b/hw/display/pl110_template.h index 0d8471db636..877419aa817 100644 --- a/hw/display/pl110_template.h +++ b/hw/display/pl110_template.h @@ -14,18 +14,18 @@ #endif #if ORDER == 0 -#define NAME glue(glue(lblp_, BORDER), BITS) +#define NAME glue(lblp_, BORDER) #ifdef HOST_WORDS_BIGENDIAN #define SWAP_WORDS 1 #endif #elif ORDER == 1 -#define NAME glue(glue(bbbp_, BORDER), BITS) +#define NAME glue(bbbp_, BORDER) #ifndef HOST_WORDS_BIGENDIAN #define SWAP_WORDS 1 #endif #else #define SWAP_PIXELS 1 -#define NAME glue(glue(lbbp_, BORDER), BITS) +#define NAME glue(lbbp_, BORDER) #ifdef HOST_WORDS_BIGENDIAN #define SWAP_WORDS 1 #endif @@ -174,14 +174,14 @@ static void glue(pl110_draw_line16_,NAME)(void *opaque, uint8_t *d, const uint8_ MSB = (data & 0x1f) << 3; data >>= 5; #endif - COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); + COPY_PIXEL(d, rgb_to_pixel32(r, g, b)); LSB = (data & 0x1f) << 3; data >>= 5; g = (data & 0x3f) << 2; data >>= 6; MSB = (data & 0x1f) << 3; data >>= 5; - COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); + COPY_PIXEL(d, rgb_to_pixel32(r, g, b)); #undef MSB #undef LSB width -= 2; @@ -211,7 +211,7 @@ static void glue(pl110_draw_line32_,NAME)(void *opaque, uint8_t *d, const uint8_ g = (data >> 16) & 0xff; MSB = (data >> 8) & 0xff; #endif - COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); + COPY_PIXEL(d, rgb_to_pixel32(r, g, b)); #undef MSB #undef LSB width--; @@ -242,14 +242,14 @@ static void glue(pl110_draw_line16_555_,NAME)(void *opaque, uint8_t *d, const ui data >>= 5; MSB = (data & 0x1f) << 3; data >>= 5; - COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); + COPY_PIXEL(d, rgb_to_pixel32(r, g, b)); LSB = (data & 0x1f) << 3; data >>= 5; g = (data & 0x1f) << 3; data >>= 5; MSB = (data & 0x1f) << 3; data >>= 6; - COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); + COPY_PIXEL(d, rgb_to_pixel32(r, g, b)); #undef MSB #undef LSB width -= 2; @@ -280,14 +280,14 @@ static void glue(pl110_draw_line12_,NAME)(void *opaque, uint8_t *d, const uint8_ data >>= 4; MSB = (data & 0xf) << 4; data >>= 8; - COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); + COPY_PIXEL(d, rgb_to_pixel32(r, g, b)); LSB = (data & 0xf) << 4; data >>= 4; g = (data & 0xf) << 4; data >>= 4; MSB = (data & 0xf) << 4; data >>= 8; - COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); + COPY_PIXEL(d, rgb_to_pixel32(r, g, b)); #undef MSB #undef LSB width -= 2; diff --git a/hw/display/pl110.c b/hw/display/pl110.c index ce300662e8b..4bf15c1da51 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -123,7 +123,6 @@ static const unsigned char *idregs[] = { pl111_id }; -#define BITS 32 #define COPY_PIXEL(to, from) do { *(uint32_t *)to = from; to += 4; } while (0) #undef RGB @@ -145,65 +144,63 @@ static const unsigned char *idregs[] = { #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 drawfn pl110_draw_fn_32[48] = { + pl110_draw_line1_lblp_bgr, + pl110_draw_line2_lblp_bgr, + pl110_draw_line4_lblp_bgr, + pl110_draw_line8_lblp_bgr, + pl110_draw_line16_555_lblp_bgr, + pl110_draw_line32_lblp_bgr, + pl110_draw_line16_lblp_bgr, + pl110_draw_line12_lblp_bgr, + + pl110_draw_line1_bbbp_bgr, + pl110_draw_line2_bbbp_bgr, + pl110_draw_line4_bbbp_bgr, + pl110_draw_line8_bbbp_bgr, + pl110_draw_line16_555_bbbp_bgr, + pl110_draw_line32_bbbp_bgr, + pl110_draw_line16_bbbp_bgr, + pl110_draw_line12_bbbp_bgr, + + pl110_draw_line1_lbbp_bgr, + pl110_draw_line2_lbbp_bgr, + pl110_draw_line4_lbbp_bgr, + pl110_draw_line8_lbbp_bgr, + pl110_draw_line16_555_lbbp_bgr, + pl110_draw_line32_lbbp_bgr, + pl110_draw_line16_lbbp_bgr, + pl110_draw_line12_lbbp_bgr, + + pl110_draw_line1_lblp_rgb, + pl110_draw_line2_lblp_rgb, + pl110_draw_line4_lblp_rgb, + pl110_draw_line8_lblp_rgb, + pl110_draw_line16_555_lblp_rgb, + pl110_draw_line32_lblp_rgb, + pl110_draw_line16_lblp_rgb, + pl110_draw_line12_lblp_rgb, + + pl110_draw_line1_bbbp_rgb, + pl110_draw_line2_bbbp_rgb, + pl110_draw_line4_bbbp_rgb, + pl110_draw_line8_bbbp_rgb, + pl110_draw_line16_555_bbbp_rgb, + pl110_draw_line32_bbbp_rgb, + pl110_draw_line16_bbbp_rgb, + pl110_draw_line12_bbbp_rgb, + + pl110_draw_line1_lbbp_rgb, + pl110_draw_line2_lbbp_rgb, + pl110_draw_line4_lbbp_rgb, + pl110_draw_line8_lbbp_rgb, + pl110_draw_line16_555_lbbp_rgb, + pl110_draw_line32_lbbp_rgb, + pl110_draw_line16_lbbp_rgb, + pl110_draw_line12_lbbp_rgb, +}; static int pl110_enabled(PL110State *s) { -- 2.20.1