From nobody Sat Apr 27 12:47:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489665749058710.8008328352046; Thu, 16 Mar 2017 05:02:29 -0700 (PDT) Received: from localhost ([::1]:43051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coU6t-0001g9-Mx for importer@patchew.org; Thu, 16 Mar 2017 08:02:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coU6A-0001e3-Sb for qemu-devel@nongnu.org; Thu, 16 Mar 2017 08:01:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coU69-0004oi-OR for qemu-devel@nongnu.org; Thu, 16 Mar 2017 08:01:42 -0400 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:35147) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1coU69-0004oG-IE for qemu-devel@nongnu.org; Thu, 16 Mar 2017 08:01:41 -0400 Received: by mail-lf0-x242.google.com with SMTP id v2so3232190lfi.2 for ; Thu, 16 Mar 2017 05:01:41 -0700 (PDT) Received: from localhost.localdomain (89-77-183-36.dynamic.chello.pl. [89.77.183.36]) by smtp.gmail.com with ESMTPSA id q98sm888854lfi.11.2017.03.16.05.01.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Mar 2017 05:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EsrqQuV+DMJ5lQk9mqKbGP623VsmtsVtyTbPFt7fTHU=; b=DF7Hu2Yo14hMfKNL8J09Of8aXbjM1p6sPn3G8int3g+BRhKPZpSrA47wTcKyEALnco cL1vGB34Mt2S05UzWFtPDwZNo2EoNcGAxIkbRRI7rGW5rPv+Wo4k8/SDpDs4BabHziiM OfJ+lHdIn9V7BVnd84p4yarhzh1I8qQYsaWCg95ecPtOB1JVuNFxxacHSrsU1r9VP2Ou HxSHgiduGYfJ7YWOq6PVOJw+wc/kR3NENcqFdybcOw4RT5xTzt4mX4Ujp8wvVmsobnDi 4Qlb0NTJrYVFf4FhRfmmZG3vYBJoEb6e0rIwIjAanirU/GySTPr4WISl2U1+ckets1uP uI4Q== 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; bh=EsrqQuV+DMJ5lQk9mqKbGP623VsmtsVtyTbPFt7fTHU=; b=Fwo1HHNa67VdacJKnnoOk/5FWu/bsL/iUWfMOTDbk/RCwnO7vBB8LTC36ZPoLW6iVE JTgvfDL2Cme0VXDpFoLfT1dzbI22q9QAzWoC/uxK7wBvPfBPiedYSJS5hhXW0nOO3wFn FeobXs9/vTlYylpZDfD+1FLvRsy9gvvZkUvgduJARDIAGzHg87M1XtQp3GXSMd7Zil5G 1yDzZfJQlUPRPyFptyCzxu4/PsEqUXEgQhLFbr7lZSUMqev2lN921ywMrNhp/Z+tGvy8 Zb23OgfQzrXmzCnNS43X52b5T6odnYwVTilGzoRpHoj8a0V6xEL/KBWVYTrKgLTjala4 25wg== X-Gm-Message-State: AFeK/H0DScR28oGno2VKTcVX4B66wmFrUXlSZBZlnHVfTVxI3/zCHB3IxafSTNZrYLqarA== X-Received: by 10.46.1.220 with SMTP id f89mr2989704lji.7.1489665699789; Thu, 16 Mar 2017 05:01:39 -0700 (PDT) From: iwona260909@gmail.com To: Date: Thu, 16 Mar 2017 13:01:10 +0100 Message-Id: <20170316120110.11677-2-iwona260909@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170316120110.11677-1-iwona260909@gmail.com> References: <20170316120110.11677-1-iwona260909@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::242 Subject: [Qemu-devel] [PATCH] Dead code removal: removing code for unsupported DEPTH. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Iwona Kotlarska Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Iwona Kotlarska Signed-off-by: Iwona Kotlarska --- hw/display/cirrus_vga.c | 3 --- hw/display/cirrus_vga_rop.h | 9 --------- hw/display/cirrus_vga_rop2.h | 46 ++--------------------------------------= ---- 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index b9e7cb1df1..efa9609ccd 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -478,9 +478,6 @@ static const cirrus_bitblt_rop_t cirrus_bkwd_transp_rop= [16][2] =3D { }; =20 #define ROP2(name) {\ - name ## _8,\ - name ## _16,\ - name ## _24,\ name ## _32,\ } =20 diff --git a/hw/display/cirrus_vga_rop.h b/hw/display/cirrus_vga_rop.h index 0925a009fe..f175c808cc 100644 --- a/hw/display/cirrus_vga_rop.h +++ b/hw/display/cirrus_vga_rop.h @@ -189,15 +189,6 @@ glue(glue(cirrus_bitblt_rop_bkwd_transp_, ROP_NAME),_1= 6)(CirrusVGAState *s, } } =20 -#define DEPTH 8 -#include "cirrus_vga_rop2.h" - -#define DEPTH 16 -#include "cirrus_vga_rop2.h" - -#define DEPTH 24 -#include "cirrus_vga_rop2.h" - #define DEPTH 32 #include "cirrus_vga_rop2.h" =20 diff --git a/hw/display/cirrus_vga_rop2.h b/hw/display/cirrus_vga_rop2.h index d28bcc6f25..adf0f30a94 100644 --- a/hw/display/cirrus_vga_rop2.h +++ b/hw/display/cirrus_vga_rop2.h @@ -22,15 +22,8 @@ * THE SOFTWARE. */ =20 -#if DEPTH =3D=3D 8 -#define PUTPIXEL() ROP_OP(&d[0], col) -#elif DEPTH =3D=3D 16 -#define PUTPIXEL() ROP_OP_16((uint16_t *)&d[0], col) -#elif DEPTH =3D=3D 24 -#define PUTPIXEL() ROP_OP(&d[0], col); \ - ROP_OP(&d[1], (col >> 8)); \ - ROP_OP(&d[2], (col >> 16)) -#elif DEPTH =3D=3D 32 + +#if DEPTH =3D=3D 32 #define PUTPIXEL() ROP_OP_32(((uint32_t *)&d[0]), col) #else #error unsupported DEPTH @@ -47,41 +40,16 @@ glue(glue(glue(cirrus_patternfill_, ROP_NAME), _),DEPTH) int x, y, pattern_y, pattern_pitch, pattern_x; unsigned int col; const uint8_t *src1; -#if DEPTH =3D=3D 24 - int skipleft =3D s->vga.gr[0x2f] & 0x1f; -#else int skipleft =3D (s->vga.gr[0x2f] & 0x07) * (DEPTH / 8); -#endif - -#if DEPTH =3D=3D 8 - pattern_pitch =3D 8; -#elif DEPTH =3D=3D 16 - pattern_pitch =3D 16; -#else pattern_pitch =3D 32; -#endif pattern_y =3D s->cirrus_blt_srcaddr & 7; for(y =3D 0; y < bltheight; y++) { pattern_x =3D skipleft; d =3D dst + skipleft; src1 =3D src + pattern_y * pattern_pitch; for (x =3D skipleft; x < bltwidth; x +=3D (DEPTH / 8)) { -#if DEPTH =3D=3D 8 - col =3D src1[pattern_x]; - pattern_x =3D (pattern_x + 1) & 7; -#elif DEPTH =3D=3D 16 - col =3D ((uint16_t *)(src1 + pattern_x))[0]; - pattern_x =3D (pattern_x + 2) & 15; -#elif DEPTH =3D=3D 24 - { - const uint8_t *src2 =3D src1 + pattern_x * 3; - col =3D src2[0] | (src2[1] << 8) | (src2[2] << 16); - pattern_x =3D (pattern_x + 1) & 7; - } -#else col =3D ((uint32_t *)(src1 + pattern_x))[0]; pattern_x =3D (pattern_x + 4) & 31; -#endif PUTPIXEL(); d +=3D (DEPTH / 8); } @@ -104,13 +72,8 @@ glue(glue(glue(cirrus_colorexpand_transp_, ROP_NAME), _= ),DEPTH) unsigned int col; unsigned bitmask; unsigned index; -#if DEPTH =3D=3D 24 - int dstskipleft =3D s->vga.gr[0x2f] & 0x1f; - int srcskipleft =3D dstskipleft / 3; -#else int srcskipleft =3D s->vga.gr[0x2f] & 0x07; int dstskipleft =3D srcskipleft * (DEPTH / 8); -#endif =20 if (s->cirrus_blt_modeext & CIRRUS_BLTMODEEXT_COLOREXPINV) { bits_xor =3D 0xff; @@ -187,13 +150,8 @@ glue(glue(glue(cirrus_colorexpand_pattern_transp_, ROP= _NAME), _),DEPTH) int x, y, bitpos, pattern_y; unsigned int bits, bits_xor; unsigned int col; -#if DEPTH =3D=3D 24 - int dstskipleft =3D s->vga.gr[0x2f] & 0x1f; - int srcskipleft =3D dstskipleft / 3; -#else int srcskipleft =3D s->vga.gr[0x2f] & 0x07; int dstskipleft =3D srcskipleft * (DEPTH / 8); -#endif =20 if (s->cirrus_blt_modeext & CIRRUS_BLTMODEEXT_COLOREXPINV) { bits_xor =3D 0xff; --=20 2.12.0