From nobody Thu Apr 25 22:11:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581639249981610.2379570615473; Thu, 13 Feb 2020 16:14:09 -0800 (PST) Received: from localhost ([::1]:32992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2OcS-0005s3-Hj for importer@patchew.org; Thu, 13 Feb 2020 19:14:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42551) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2ObV-0004Wi-Oh for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2ObU-0006wn-Ig for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:09 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50326) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2ObU-0006vZ-C2 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:08 -0500 Received: by mail-wm1-x343.google.com with SMTP id a5so8214327wmb.0 for ; Thu, 13 Feb 2020 16:13:08 -0800 (PST) Received: from x1w.redhat.com (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a16sm4679230wrx.87.2020.02.13.16.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 16:13:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zf3PhdUFbvcfneYdRj7vR71aYgxGRLP50x8FK7k3NmM=; b=Gpm8ei4PXPy4sTI7Lr2b+e5Zdo6EzbMQzEVDq3Cpowhhllw2VPMnBFUYCUZin8eXmk cCS1p5eCLkyWNCA3UDG5Z9LTx+Nn49fg+ozUTOUKcx+dvlMziBBMF3nDwVHAMvt1jDYU zgoJ7oovMT9rNVmT07WId0eX8wdTQba6/Dqvt5/ejx0IPQ8Uk+AyKTCM6dEsO4S9XKW9 zzYEwE2CDC5eEbLyV1KznuHfJbOikZxNhpTtzH5qvj2miZFwX4HJ9dpkVinRIfVCPw4m lyMY2atncTdwt5f79E1XUnJIPP5cvxEYcXVrZSHJOCpg13KqSBT/eBCczugaUZd+k7ge jPjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zf3PhdUFbvcfneYdRj7vR71aYgxGRLP50x8FK7k3NmM=; b=GQWoAoABSZo9lVyTZ99grEQ7MxghM/Xs+0mdI43oH2+KYR5z1LOXD81ySKuIHbSxaW BHESv8d0Y6XWDjFIzzpelwxmI4B4IRRXoE93gJwLk2XMompcS0c5tsoSfqGpkEM9omGL /0FxkW2hy7ETZSRHRe81H5kPsThmWvC6dDeMjVWKfqtuTk2r+BZUIP7DKqiXijz+uNYn Pqnzn5X/ztM7c/HPAikbejSZtPJsVHtsTZdkh6VOdhyrzy798VNw1P7OOTGV64k+xy0j bJMRPVFVP4vTZGvrHcHHYdF/cWo+GMPRu/S+VjuZwTuI5NYVO7ZdzkU2O75EgyDjECrB 5anA== X-Gm-Message-State: APjAAAW2j/CWrybrejUfxKCfRFPIrRBlYBu6MzgVO8GsuDYzFI5suBsZ bArDswtKXgTZUdoSC985ERc= X-Google-Smtp-Source: APXvYqxTsS3EfD97FXZK79cm0JlFMR7dwrBk8jPthBh5PyLMpnB9jaMeL4tlWg3Q+b8Sj7F3TiIOqw== X-Received: by 2002:a7b:c93a:: with SMTP id h26mr667551wml.83.1581639187339; Thu, 13 Feb 2020 16:13:07 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Helge Deller , qemu-devel@nongnu.org, Sven Schnelle Subject: [PATCH 1/5] hw/display/artist: Move trace event to draw_line() Date: Fri, 14 Feb 2020 01:12:58 +0100 Message-Id: <20200214001303.12873-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200214001303.12873-1-f4bug@amsat.org> References: <20200214001303.12873-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Instead of emitting the trace event before each call to draw_line(), call it once at draw_line() entrance. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Sven Schnelle --- hw/display/artist.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/display/artist.c b/hw/display/artist.c index 65be9e3554..abacb0e27d 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -557,90 +557,91 @@ static void fill_window(ARTISTState *s, int startx, i= nt starty, static void draw_line(ARTISTState *s, int x1, int y1, int x2, int y2, bool update_start, int skip_pix, int max_pix) { struct vram_buffer *buf; uint8_t color =3D artist_get_color(s); int dx, dy, t, e, x, y, incy, diago, horiz; bool c1; uint8_t *p; =20 + trace_artist_draw_line(x1, y1, x2, y2); =20 if (update_start) { s->vram_start =3D (x2 << 16) | y2; } =20 buf =3D &s->vram_buffer[ARTIST_BUFFER_AP]; =20 c1 =3D false; incy =3D 1; =20 if (x2 > x1) { dx =3D x2 - x1; } else { dx =3D x1 - x2; } if (y2 > y1) { dy =3D y2 - y1; } else { dy =3D y1 - y2; } if (dy > dx) { t =3D y2; y2 =3D x2; x2 =3D t; =20 t =3D y1; y1 =3D x1; x1 =3D t; =20 t =3D dx; dx =3D dy; dy =3D t; =20 c1 =3D true; } =20 if (x1 > x2) { t =3D y2; y2 =3D y1; y1 =3D t; =20 t =3D x1; x1 =3D x2; x2 =3D t; } =20 horiz =3D dy << 1; diago =3D (dy - dx) << 1; e =3D (dy << 1) - dx; =20 if (y1 <=3D y2) { incy =3D 1; } else { incy =3D -1; } x =3D x1; y =3D y1; =20 do { if (c1) { p =3D buf->data + x * s->width + y; } else { p =3D buf->data + y * s->width + x; } =20 if (skip_pix > 0) { skip_pix--; } else { artist_rop8(s, p, color); } =20 if (e > 0) { artist_invalidate_lines(buf, y, 1); y +=3D incy; e +=3D diago; } else { e +=3D horiz; } x++; } while (x <=3D x2 && (max_pix =3D=3D -1 || --max_pix > 0)); } @@ -648,13 +649,12 @@ static void draw_line(ARTISTState *s, int x1, int y1,= int x2, int y2, static void draw_line_pattern_start(ARTISTState *s) { =20 int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int endx =3D artist_get_x(s->blockmove_size); int endy =3D artist_get_y(s->blockmove_size); int pstart =3D s->line_pattern_start >> 16; =20 - trace_artist_draw_line(startx, starty, endx, endy); draw_line(s, startx, starty, endx, endy, false, -1, pstart); s->line_pattern_skip =3D pstart; } @@ -662,15 +662,14 @@ static void draw_line_pattern_start(ARTISTState *s) static void draw_line_pattern_next(ARTISTState *s) { =20 int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int endx =3D artist_get_x(s->blockmove_size); int endy =3D artist_get_y(s->blockmove_size); int line_xy =3D s->line_xy >> 16; =20 - trace_artist_draw_line(startx, starty, endx, endy); draw_line(s, startx, starty, endx, endy, false, s->line_pattern_skip, s->line_pattern_skip + line_xy); s->line_pattern_skip +=3D line_xy; s->image_bitmap_op ^=3D 2; } @@ -678,84 +677,81 @@ static void draw_line_pattern_next(ARTISTState *s) static void draw_line_size(ARTISTState *s, bool update_start) { =20 int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int endx =3D artist_get_x(s->line_size); int endy =3D artist_get_y(s->line_size); =20 - trace_artist_draw_line(startx, starty, endx, endy); draw_line(s, startx, starty, endx, endy, update_start, -1, -1); } =20 static void draw_line_xy(ARTISTState *s, bool update_start) { =20 int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int sizex =3D artist_get_x(s->blockmove_size); int sizey =3D artist_get_y(s->blockmove_size); int linexy =3D s->line_xy >> 16; int endx, endy; =20 endx =3D startx; endy =3D starty; =20 if (sizex > 0) { endx =3D startx + linexy; } =20 if (sizex < 0) { endx =3D startx; startx -=3D linexy; } =20 if (sizey > 0) { endy =3D starty + linexy; } =20 if (sizey < 0) { endy =3D starty; starty -=3D linexy; } =20 if (startx < 0) { startx =3D 0; } =20 if (endx < 0) { endx =3D 0; } =20 if (starty < 0) { starty =3D 0; } =20 if (endy < 0) { endy =3D 0; } =20 =20 if (endx < 0) { return; } =20 if (endy < 0) { return; } =20 - trace_artist_draw_line(startx, starty, endx, endy); draw_line(s, startx, starty, endx, endy, false, -1, -1); } =20 static void draw_line_end(ARTISTState *s, bool update_start) { =20 int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int endx =3D artist_get_x(s->line_end); int endy =3D artist_get_y(s->line_end); =20 - trace_artist_draw_line(startx, starty, endx, endy); draw_line(s, startx, starty, endx, endy, update_start, -1, -1); } =20 --=20 2.21.1 From nobody Thu Apr 25 22:11:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581639251799240.07058789249834; Thu, 13 Feb 2020 16:14:11 -0800 (PST) Received: from localhost ([::1]:32994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2OcU-0005uq-E6 for importer@patchew.org; Thu, 13 Feb 2020 19:14:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42568) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2ObW-0004Wm-TA for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2ObV-0006yP-Qd for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:10 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:39509) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2ObV-0006xO-LA for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:09 -0500 Received: by mail-wr1-x432.google.com with SMTP id y11so8911343wrt.6 for ; Thu, 13 Feb 2020 16:13:09 -0800 (PST) Received: from x1w.redhat.com (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a16sm4679230wrx.87.2020.02.13.16.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 16:13:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BURr7oChrNXkwDXgH5BYlsw5Omt/vezePcTIQ4aD6qU=; b=YvTojqqNlH6r1jEo+Lmf9lgk5mUKXhz0GgfAyXMu+38Ji33j+u4OJ5lCR62AGCP9Ws MrbbeF4ugdqjDRkOlJ7Vb9lhGJFdTqbRUUHWXbSJ4+0kQH3/43tjniJZIu6u85LqmyOK oLXjWwgLYrRDYUyJz1ZLH7Stt/B57sbWqFZFfYAswEof31V9mWZMT4G69mvl3FO6uwtD jO3cwYLTFMv8uxb5787x0l1bUxpTvXZ5ZsVBp24jFhsgp62CWoHyybizlLvcJ32Iy1iI xEurRRYeZfKgAYGhQlAovirQ6NY+f7teI/S9/fID9UQGJKgEUGFBo9qP7EVFJKnUuswv SrZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BURr7oChrNXkwDXgH5BYlsw5Omt/vezePcTIQ4aD6qU=; b=cpHf5RQhHtzHpUngyDD5yK7ddUMca4SvqRSo1f1GdU1Fa78F4DDSBuLv1qX0TqrGZn sA84Xp/Www/N6b82jlCh+3ELra5QCwDfb7Wd3/UeGzs/OMd7Pf0SiusDPli76c0m7/B7 QrDJ5szoprCoOpYdSJUvP1Cz+x5oKijM0OP2zxUQ3c1No+WnL+ASpeZy/lZnE8BIg6nc faVIjPN8wUeQqjAmfMg1ft3+O1zNhmvYMx77jEZlygVg4h8yJivH8tr1HynvSrU13bo3 vC8YeNdh2WEPwPr7d0BqNHPx7UIe/SRrLCh9dL/2inIAT1/C8cQkGWuo7gIMZ10026Fz fbMw== X-Gm-Message-State: APjAAAW8J4mhVmapqFttIcxxv+FAjxVKaowjnOoi6Rl/d1BofbOevTVj sHA7fVlcnbK1st7LfISyx/A= X-Google-Smtp-Source: APXvYqwfLHQ8DuKrtSlctxFPyN4v5UR/b1UmD5QasLCJkSquNgJhtjxtcV+7fFud89h0zoWgJrFSgQ== X-Received: by 2002:a5d:61c2:: with SMTP id q2mr14492wrv.425.1581639188745; Thu, 13 Feb 2020 16:13:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Helge Deller , qemu-devel@nongnu.org, Sven Schnelle Subject: [PATCH 2/5] hw/display/artist: Remove pointless initialization Date: Fri, 14 Feb 2020 01:12:59 +0100 Message-Id: <20200214001303.12873-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200214001303.12873-1-f4bug@amsat.org> References: <20200214001303.12873-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We are initializating incy inconditionally: if (y1 <=3D y2) { incy =3D 1; } else { incy =3D -1; } Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Sven Schnelle --- hw/display/artist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/display/artist.c b/hw/display/artist.c index abacb0e27d..47f0e9f0bc 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -557,91 +557,90 @@ static void fill_window(ARTISTState *s, int startx, i= nt starty, static void draw_line(ARTISTState *s, int x1, int y1, int x2, int y2, bool update_start, int skip_pix, int max_pix) { struct vram_buffer *buf; uint8_t color =3D artist_get_color(s); int dx, dy, t, e, x, y, incy, diago, horiz; bool c1; uint8_t *p; =20 trace_artist_draw_line(x1, y1, x2, y2); =20 if (update_start) { s->vram_start =3D (x2 << 16) | y2; } =20 buf =3D &s->vram_buffer[ARTIST_BUFFER_AP]; =20 c1 =3D false; - incy =3D 1; =20 if (x2 > x1) { dx =3D x2 - x1; } else { dx =3D x1 - x2; } if (y2 > y1) { dy =3D y2 - y1; } else { dy =3D y1 - y2; } if (dy > dx) { t =3D y2; y2 =3D x2; x2 =3D t; =20 t =3D y1; y1 =3D x1; x1 =3D t; =20 t =3D dx; dx =3D dy; dy =3D t; =20 c1 =3D true; } =20 if (x1 > x2) { t =3D y2; y2 =3D y1; y1 =3D t; =20 t =3D x1; x1 =3D x2; x2 =3D t; } =20 horiz =3D dy << 1; diago =3D (dy - dx) << 1; e =3D (dy << 1) - dx; =20 if (y1 <=3D y2) { incy =3D 1; } else { incy =3D -1; } x =3D x1; y =3D y1; =20 do { if (c1) { p =3D buf->data + x * s->width + y; } else { p =3D buf->data + y * s->width + x; } =20 if (skip_pix > 0) { skip_pix--; } else { artist_rop8(s, p, color); } =20 if (e > 0) { artist_invalidate_lines(buf, y, 1); y +=3D incy; e +=3D diago; } else { e +=3D horiz; } x++; } while (x <=3D x2 && (max_pix =3D=3D -1 || --max_pix > 0)); } --=20 2.21.1 From nobody Thu Apr 25 22:11:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158163932632623.220140203534697; Thu, 13 Feb 2020 16:15:26 -0800 (PST) Received: from localhost ([::1]:33008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Odh-0008Fz-3Q for importer@patchew.org; Thu, 13 Feb 2020 19:15:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42585) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2ObY-0004XT-0u for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2ObW-0006zs-VZ for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:11 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:53388) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2ObW-0006yz-PQ for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:10 -0500 Received: by mail-wm1-x343.google.com with SMTP id s10so8217109wmh.3 for ; Thu, 13 Feb 2020 16:13:10 -0800 (PST) Received: from x1w.redhat.com (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a16sm4679230wrx.87.2020.02.13.16.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 16:13:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yP9ZmNzMNal3Q8l+6FmOLMJ3w/noghwCGkFho029Ppw=; b=ttXJH5U0v1Xi3a4PZcP8z0wRXcXHU5m058eW47UMg3lVQmVgIyvkrPTm5QHnYtH8Sa HFTo7Fg2usLvJ4H0jPvYXnCDvJICOAqN4QkvdhNUJhbIp7BbY6qDgz8yXnxpP7B3Ogpb elBog8yerWblRiXGbpmrjCEUTyCqq33zEMSxPqGnqyY+OnNaxidkVwU8tZH10fE2rJXn tVBp16k/w92no1AFRcL1QKGCvGONNFVNlWIGTqoHvi/sIR1ctYxasxAIi8lckEzrM8Mp w6hGMsNxFLQ6/0nOWmxpyfLODsqr9WWNGtgakfilGRt2J/gz2xb5UqkGxoknijC9w35N E0Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=yP9ZmNzMNal3Q8l+6FmOLMJ3w/noghwCGkFho029Ppw=; b=F7poE4OfT3QtRymi9DVAsz5Br9S+a9ZI8glO0mnC53JgV4ATlms0aXRsm4Ek2+JEHR NV8dJ3a9h88MQsY5KFv1+mOqB4z4E7maQobO2c/YaXN5XlXYRg3uq9KlPklFSJwC578p Z2jEkAg5bcoezKjYMC+sZ5R4fTQqxV/fFxfow1ZfDc/796dJ8v9r8MHvWB2pF3JDk0uT TnCiBsanxYEBuyK3zwnS4SxOWlMiziI7vXaMOZ2o8Yiy8On/s2K63aqi4r5VU6sBbldZ kfdBQePa6mA7yO+982++taFNp84TgDpmiHzDU98ytoxSP56gVXBmwS9TKRqk+J+7xktw WBIQ== X-Gm-Message-State: APjAAAXKFMERPSK1wFZXlmf4weJ7fTZr+/6KRfd/rpgs1A0EqOXkvuGZ Armqc1fyV8JN9qHs+U1PUkg= X-Google-Smtp-Source: APXvYqydPo6xuhkWDqGB4u75ug48zex7RW5HQ7wJeMMj3qRmtL8Lo3FB8Rm5kUKo92UbI7ETsR7CLw== X-Received: by 2002:a05:600c:22d3:: with SMTP id 19mr662952wmg.20.1581639189859; Thu, 13 Feb 2020 16:13:09 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Helge Deller , qemu-devel@nongnu.org, Sven Schnelle Subject: [PATCH 3/5] hw/display/artist: Delay some variables initialization Date: Fri, 14 Feb 2020 01:13:00 +0100 Message-Id: <20200214001303.12873-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200214001303.12873-1-f4bug@amsat.org> References: <20200214001303.12873-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We want to have an early exit path. Delay some initializations before the variables are used. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Sven Schnelle --- hw/display/artist.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/display/artist.c b/hw/display/artist.c index 47f0e9f0bc..97c811b35e 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -557,90 +557,90 @@ static void fill_window(ARTISTState *s, int startx, i= nt starty, static void draw_line(ARTISTState *s, int x1, int y1, int x2, int y2, bool update_start, int skip_pix, int max_pix) { struct vram_buffer *buf; - uint8_t color =3D artist_get_color(s); + uint8_t color; int dx, dy, t, e, x, y, incy, diago, horiz; bool c1; uint8_t *p; =20 trace_artist_draw_line(x1, y1, x2, y2); =20 if (update_start) { s->vram_start =3D (x2 << 16) | y2; } =20 - buf =3D &s->vram_buffer[ARTIST_BUFFER_AP]; - - c1 =3D false; - if (x2 > x1) { dx =3D x2 - x1; } else { dx =3D x1 - x2; } if (y2 > y1) { dy =3D y2 - y1; } else { dy =3D y1 - y2; } + + c1 =3D false; if (dy > dx) { t =3D y2; y2 =3D x2; x2 =3D t; =20 t =3D y1; y1 =3D x1; x1 =3D t; =20 t =3D dx; dx =3D dy; dy =3D t; =20 c1 =3D true; } =20 if (x1 > x2) { t =3D y2; y2 =3D y1; y1 =3D t; =20 t =3D x1; x1 =3D x2; x2 =3D t; } =20 horiz =3D dy << 1; diago =3D (dy - dx) << 1; e =3D (dy << 1) - dx; =20 if (y1 <=3D y2) { incy =3D 1; } else { incy =3D -1; } x =3D x1; y =3D y1; + color =3D artist_get_color(s); + buf =3D &s->vram_buffer[ARTIST_BUFFER_AP]; =20 do { if (c1) { p =3D buf->data + x * s->width + y; } else { p =3D buf->data + y * s->width + x; } =20 if (skip_pix > 0) { skip_pix--; } else { artist_rop8(s, p, color); } =20 if (e > 0) { artist_invalidate_lines(buf, y, 1); y +=3D incy; e +=3D diago; } else { e +=3D horiz; } x++; } while (x <=3D x2 && (max_pix =3D=3D -1 || --max_pix > 0)); } --=20 2.21.1 From nobody Thu Apr 25 22:11:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581639333776565.131420458209; Thu, 13 Feb 2020 16:15:33 -0800 (PST) Received: from localhost ([::1]:33018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Odo-0008R1-BB for importer@patchew.org; Thu, 13 Feb 2020 19:15:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42603) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2ObZ-0004Ze-41 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2ObY-00071E-2j for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:13 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:35736) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2ObX-00070O-Ss for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:12 -0500 Received: by mail-wr1-x434.google.com with SMTP id w12so8922867wrt.2 for ; Thu, 13 Feb 2020 16:13:11 -0800 (PST) Received: from x1w.redhat.com (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a16sm4679230wrx.87.2020.02.13.16.13.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 16:13:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oCtK+42l2rwmoTfk+qizXxhXlan3l2UxeBXnHI+77tM=; b=QI+QBxV5lX8oBqhAQPFsozi+7uVWC6eRMoLP1PTU7oTTAofVo6/WklzshMvn8lpb7u 2oRENyiKsWZYT5d3IFcG/cTjd07pd1x3s4bxZj2szae2+PyaDp/g3hCJ6fqem7rH5VvN ItimTSwZ+sNT8U3k+PPltPYjsqnupk3PlNltAb6sjeNCGYCw/mspJAagew6oaR4OkjHU mBRqj8pMTEdbXgEnD0DsrN5HZknlf/Pymg6xfJZ/LtBJtBVdFGrrBgxL+Arwigi9RB2A rxgk9csxETO8jSfVAsTBzmtC6RQhBNuW7GgvVyXUSYe8Xten8Knc89vHkASGW1o0ybEI K+Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oCtK+42l2rwmoTfk+qizXxhXlan3l2UxeBXnHI+77tM=; b=gpGkCD0lpvD28+KjU9sQ9XY93FyVyF6dI05FdhvJPCSNRzIrUEcXzWRk6QqjGftIuB vHy4YHmHHMrsAi6ot4GXkhwOv02kykDmzZZS9EjcyBsun6UCXbige6BuQQycFeWjcz/U UdQJo3wdTozhZJO/z2J+ks9r5YYn3OxjqfTYxhoVvHTSV1hyjFxyoQfv0ox9rlLz/tNu RdCp11BhAGByzehqoZ8ZbeKFY0wzocXbgBaJLM+Iap74HVFVKir3TXC/+/p3/FSGox0S xBhhBk+e1AXKX8GduFiyh1GjIv3TmFpNYPo/ifaeTjWfq2AW6xwVXUTnRNlcCJh2iCNl vNGw== X-Gm-Message-State: APjAAAVPnE98Fu79/qXKFuoOlauyTvZp1MdxQXiFOZOOVnZnr+MpLIL+ Ol25jPgovKEERc2aFpou1og= X-Google-Smtp-Source: APXvYqzhGTgSfAQk8uAOtlDHVzxAKl0UmIUGENqpH/8wbpnDst4QzsuhChAh6959BU9MNMhEJQuJyA== X-Received: by 2002:adf:e742:: with SMTP id c2mr74252wrn.346.1581639191059; Thu, 13 Feb 2020 16:13:11 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Helge Deller , qemu-devel@nongnu.org, Sven Schnelle Subject: [RFC PATCH 4/5] hw/display/artist: Avoid drawing line when nothing to display Date: Fri, 14 Feb 2020 01:13:01 +0100 Message-Id: <20200214001303.12873-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200214001303.12873-1-f4bug@amsat.org> References: <20200214001303.12873-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC because untested =3D) --- hw/display/artist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/display/artist.c b/hw/display/artist.c index 97c811b35e..5492079116 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -557,90 +557,93 @@ static void fill_window(ARTISTState *s, int startx, i= nt starty, static void draw_line(ARTISTState *s, int x1, int y1, int x2, int y2, bool update_start, int skip_pix, int max_pix) { struct vram_buffer *buf; uint8_t color; int dx, dy, t, e, x, y, incy, diago, horiz; bool c1; uint8_t *p; =20 trace_artist_draw_line(x1, y1, x2, y2); =20 if (update_start) { s->vram_start =3D (x2 << 16) | y2; } =20 if (x2 > x1) { dx =3D x2 - x1; } else { dx =3D x1 - x2; } if (y2 > y1) { dy =3D y2 - y1; } else { dy =3D y1 - y2; } + if (!dx || !dy) { + return; + } =20 c1 =3D false; if (dy > dx) { t =3D y2; y2 =3D x2; x2 =3D t; =20 t =3D y1; y1 =3D x1; x1 =3D t; =20 t =3D dx; dx =3D dy; dy =3D t; =20 c1 =3D true; } =20 if (x1 > x2) { t =3D y2; y2 =3D y1; y1 =3D t; =20 t =3D x1; x1 =3D x2; x2 =3D t; } =20 horiz =3D dy << 1; diago =3D (dy - dx) << 1; e =3D (dy << 1) - dx; =20 if (y1 <=3D y2) { incy =3D 1; } else { incy =3D -1; } x =3D x1; y =3D y1; color =3D artist_get_color(s); buf =3D &s->vram_buffer[ARTIST_BUFFER_AP]; =20 do { if (c1) { p =3D buf->data + x * s->width + y; } else { p =3D buf->data + y * s->width + x; } =20 if (skip_pix > 0) { skip_pix--; } else { artist_rop8(s, p, color); } =20 if (e > 0) { artist_invalidate_lines(buf, y, 1); y +=3D incy; e +=3D diago; } else { e +=3D horiz; } x++; } while (x <=3D x2 && (max_pix =3D=3D -1 || --max_pix > 0)); } --=20 2.21.1 From nobody Thu Apr 25 22:11:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581639331810994.3034736362367; Thu, 13 Feb 2020 16:15:31 -0800 (PST) Received: from localhost ([::1]:33016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Odm-0008P1-Iv for importer@patchew.org; Thu, 13 Feb 2020 19:15:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42630) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Oba-0004dD-He for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2ObZ-000732-EA for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:14 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2ObZ-00071t-81 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 19:13:13 -0500 Received: by mail-wr1-x443.google.com with SMTP id n10so6978807wrm.1 for ; Thu, 13 Feb 2020 16:13:13 -0800 (PST) Received: from x1w.redhat.com (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a16sm4679230wrx.87.2020.02.13.16.13.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 16:13:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/GXo767UdRFEyYDVqlkyBO/vQxNmKoLjr1aO6Lp1dSk=; b=SNVUDmXLeWx/ExjMctr3wCst0bLflOLN1++mOAWbwIEWiLK7AdAhEnU0ymZHkCDrI1 6S4OjSN3O+fKKYksSFXBbqW7DMO6/L8AFlBx7AuueUQNEKRBFhU/w6Kj8oy9pzeJ8dYZ jfaLZ9OuE/HUbcTrjjDheww6xITVvi8HETzdS2O8jEB003NZq01R9/xm8uVJJkT2OhND 3WLQmPLF2WCcHIOdUqarNloVg/K2lcf/k7d2ViYy3hHiNtn0dHIkz50DK8dUVl7GDGu4 N01C6rFPXxKaMCfFK3TYe+HIiG8cCs67+u5jGNWNO/BpJi20HPTNZhV+0CWW+jDFAhE9 0lSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/GXo767UdRFEyYDVqlkyBO/vQxNmKoLjr1aO6Lp1dSk=; b=hSvlnFtG/6KjXbVdMvTm/opzSmdgGF+zQIHIdP09ZfaVPz39IbQ++BHrzCJNNcAUqH GhyR/b1cJ4oMvBBi/b3qw81kDnTQ9J9ubMqVKWQet49V3yebZVpqr/BFuhWrYEHOLIUP ClbWxlrrjzFb6jBMh94M67FuJfvM1Q4ISsl6uCV9BsEruwZywQNn3Z7eJTI/rCd5hUkn R6TmD701ryrWiGBD+NR6l1FHFw8Hh9Un1XLnzU8021Ad+wclqNAv0Xu87lgOakBmcPfK /N/UWS9U4V98eWf/YBWmaWttveOHl7IBjhwSkXPnzrB9YgNp4VCLBTDde8TUfujoFvpc II8w== X-Gm-Message-State: APjAAAUAeIM7TvJ2ZGjA/hI3R3BaeZE47kVVY2X2+kYQg4fTkzWpuBPh maxQC7t7r4Tr+rAYr+ZxV+c= X-Google-Smtp-Source: APXvYqxZCHTcECigzvU8RazFsk8YtTr1gWYMURQgj+9RoZbeBYgExNu4B6ujtzQD5P6vVISJ4n6Erw== X-Received: by 2002:a5d:6411:: with SMTP id z17mr62122wru.57.1581639192269; Thu, 13 Feb 2020 16:13:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Helge Deller , qemu-devel@nongnu.org, Sven Schnelle Subject: [PATCH 5/5] hw/display/artist: Remove dead code (CID 1419388 & 1419389) Date: Fri, 14 Feb 2020 01:13:02 +0100 Message-Id: <20200214001303.12873-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200214001303.12873-1-f4bug@amsat.org> References: <20200214001303.12873-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Coverity reports: *** CID 1419388: Control flow issues (DEADCODE) /hw/display/artist.c: 739 in draw_line_xy() 733 if (endy < 0) { 734 endy =3D 0; 735 } 736 737 738 if (endx < 0) { >>> CID 1419388: Control flow issues (DEADCODE) >>> Execution cannot reach this statement: "return;". 739 return; 740 } 741 742 if (endy < 0) { 743 return; 744 } *** CID 1419389: Control flow issues (DEADCODE) /hw/display/artist.c: 743 in draw_line_xy() 737 738 if (endx < 0) { 739 return; 740 } 741 742 if (endy < 0) { >>> CID 1419389: Control flow issues (DEADCODE) >>> Execution cannot reach this statement: "return;". 743 return; 744 } 745 746 trace_artist_draw_line(startx, starty, endx, endy); 747 draw_line(s, startx, starty, endx, endy, false, -1, -1); 748 } Fixes: Covertiy CID 1419388 and 1419389 (commit 4765384ce33) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Sven Schnelle --- hw/display/artist.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hw/display/artist.c b/hw/display/artist.c index 5492079116..753dbb9a77 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -690,59 +690,50 @@ static void draw_line_size(ARTISTState *s, bool updat= e_start) static void draw_line_xy(ARTISTState *s, bool update_start) { =20 int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int sizex =3D artist_get_x(s->blockmove_size); int sizey =3D artist_get_y(s->blockmove_size); int linexy =3D s->line_xy >> 16; int endx, endy; =20 endx =3D startx; endy =3D starty; =20 if (sizex > 0) { endx =3D startx + linexy; } =20 if (sizex < 0) { endx =3D startx; startx -=3D linexy; } =20 if (sizey > 0) { endy =3D starty + linexy; } =20 if (sizey < 0) { endy =3D starty; starty -=3D linexy; } =20 if (startx < 0) { startx =3D 0; } =20 if (endx < 0) { endx =3D 0; } =20 if (starty < 0) { starty =3D 0; } =20 if (endy < 0) { endy =3D 0; } =20 - - if (endx < 0) { - return; - } - - if (endy < 0) { - return; - } - draw_line(s, startx, starty, endx, endy, false, -1, -1); } =20 --=20 2.21.1