From nobody Tue Feb 10 11:33:48 2026 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 1492764249200318.3431985530492; Fri, 21 Apr 2017 01:44:09 -0700 (PDT) Received: from localhost ([::1]:57932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1UAh-0002KC-Sv for importer@patchew.org; Fri, 21 Apr 2017 04:44:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1U00-0002iL-Qz for qemu-devel@nongnu.org; Fri, 21 Apr 2017 04:33:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Tzv-0002pH-UN for qemu-devel@nongnu.org; Fri, 21 Apr 2017 04:33:04 -0400 Received: from chuckie.co.uk ([82.165.15.123]:50205 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Tzv-0002pB-Nq for qemu-devel@nongnu.org; Fri, 21 Apr 2017 04:32:59 -0400 Received: from host86-191-119-77.range86-191.btcentralplus.com ([86.191.119.77] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1d1TwV-0002g4-2x; Fri, 21 Apr 2017 09:29:28 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, kraxel@redhat.com Date: Fri, 21 Apr 2017 09:28:44 +0100 Message-Id: <1492763327-12742-11-git-send-email-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1492763327-12742-1-git-send-email-mark.cave-ayland@ilande.co.uk> References: <1492763327-12742-1-git-send-email-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 86.191.119.77 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH v2 10/13] tcx: remove TARGET_PAGE_SIZE from tcx24_update_display() 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: Mark Cave-Ayland 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" Now that page alignment is handled by the memory API, there is no need to duplicate the code 4 times (4 * 1024 =3D=3D 4096 =3D=3D TARGET_PAGE_SIZE). Finally we have now removed all traces of TARGET_PAGE_SIZE. Signed-off-by: Mark Cave-Ayland Reviewed-by: Gerd Hoffmann --- hw/display/tcx.c | 46 ++++++---------------------------------------- 1 file changed, 6 insertions(+), 40 deletions(-) diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 14a17fe..0dd007e 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" -#include "cpu.h" /* FIXME shouldn't use TARGET_PAGE_SIZE */ #include "ui/console.h" #include "ui/pixel_ops.h" #include "hw/loader.h" @@ -423,8 +422,8 @@ static void tcx24_update_display(void *opaque) ds =3D 1024; =20 memory_region_sync_dirty_bitmap(&ts->vram_mem); - for (y =3D 0; y < ts->height; page +=3D TARGET_PAGE_SIZE) { - if (tcx_check_dirty(ts, page, TARGET_PAGE_SIZE)) { + for (y =3D 0; y < ts->height; y++, page +=3D ds) { + if (tcx_check_dirty(ts, page, ds)) { if (y_start < 0) y_start =3D y; if (page < page_min) @@ -435,38 +434,6 @@ static void tcx24_update_display(void *opaque) if (y >=3D ts->cursy && y < ts->cursy+32 && ts->cursx < ts->wi= dth) { tcx_draw_cursor32(ts, d, y, ts->width); } - d +=3D dd; - s +=3D ds; - cptr +=3D ds; - s24 +=3D ds; - y++; - tcx24_draw_line32(ts, d, s, ts->width, cptr, s24); - if (y >=3D ts->cursy && y < ts->cursy+32 && ts->cursx < ts->wi= dth) { - tcx_draw_cursor32(ts, d, y, ts->width); - } - d +=3D dd; - s +=3D ds; - cptr +=3D ds; - s24 +=3D ds; - y++; - tcx24_draw_line32(ts, d, s, ts->width, cptr, s24); - if (y >=3D ts->cursy && y < ts->cursy+32 && ts->cursx < ts->wi= dth) { - tcx_draw_cursor32(ts, d, y, ts->width); - } - d +=3D dd; - s +=3D ds; - cptr +=3D ds; - s24 +=3D ds; - y++; - tcx24_draw_line32(ts, d, s, ts->width, cptr, s24); - if (y >=3D ts->cursy && y < ts->cursy+32 && ts->cursx < ts->wi= dth) { - tcx_draw_cursor32(ts, d, y, ts->width); - } - d +=3D dd; - s +=3D ds; - cptr +=3D ds; - s24 +=3D ds; - y++; } else { if (y_start >=3D 0) { /* flush to display */ @@ -474,12 +441,11 @@ static void tcx24_update_display(void *opaque) ts->width, y - y_start); y_start =3D -1; } - d +=3D dd * 4; - s +=3D ds * 4; - cptr +=3D ds * 4; - s24 +=3D ds * 4; - y +=3D 4; } + d +=3D dd; + s +=3D ds; + cptr +=3D ds; + s24 +=3D ds; } if (y_start >=3D 0) { /* flush to display */ --=20 1.7.10.4