From nobody Tue Apr 30 09:45:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568884402; cv=none; d=zoho.com; s=zohoarc; b=Ji1DFUJMKz///2GHC8vGfgIAu3RnvrKlvKjNiMSSyNLA6FoW4eBzy48Td8YBFdyMouAD0xFQ9X6tkK3K9G3YAvX4oXMqI5AqGRuHTdwnCNtaWPtRHh8PkNEJXhRY0Pgt8K6mUWq6MphyRCciIcdYI7dv+zeK/GPfxQDtPfPcsaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568884402; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3xwEO3p0pBrOTm9iYaL98bYJndGMhc+Fo9GSlYSwkHg=; b=VEJlrtw3q5ntU9VWTkiFuFuqdnh+IbUhaOZkO4nyZYkRjr/stN2wC945Cte1FdFJaNfIGN9FpDcDwEuJNIItwol2LmuojPk3lA0UsMhL+ShrXjbHDq9XlCS7vMcULGJF1M/cqL5QKhilYdv3dNbJDx3/0QuD/kFO3KzYJcJf5kc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15688844024271020.039257234942; Thu, 19 Sep 2019 02:13:22 -0700 (PDT) Received: from localhost ([::1]:40584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAsV3-0006Up-Vo for importer@patchew.org; Thu, 19 Sep 2019 05:13:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39828) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAsSg-0003sM-43 for qemu-devel@nongnu.org; Thu, 19 Sep 2019 05:10:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAsSe-0003RU-HB for qemu-devel@nongnu.org; Thu, 19 Sep 2019 05:10:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42076) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAsSe-0003Qo-9c for qemu-devel@nongnu.org; Thu, 19 Sep 2019 05:10:48 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F8B03175288 for ; Thu, 19 Sep 2019 09:10:47 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-47.ams2.redhat.com [10.36.116.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 337E85D6C8; Thu, 19 Sep 2019 09:10:44 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7862917536; Thu, 19 Sep 2019 11:10:43 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 19 Sep 2019 11:10:42 +0200 Message-Id: <20190919091043.24503-2-kraxel@redhat.com> In-Reply-To: <20190919091043.24503-1-kraxel@redhat.com> References: <20190919091043.24503-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 19 Sep 2019 09:10:47 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/2] vga: move access helpers to separate include file 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20190917111441.27405-2-kraxel@redhat.com --- hw/display/vga-access.h | 49 ++++++++++++++++++++++++++++++++++++++++ hw/display/vga-helpers.h | 26 --------------------- hw/display/vga.c | 1 + 3 files changed, 50 insertions(+), 26 deletions(-) create mode 100644 hw/display/vga-access.h diff --git a/hw/display/vga-access.h b/hw/display/vga-access.h new file mode 100644 index 000000000000..c0fbd9958b2e --- /dev/null +++ b/hw/display/vga-access.h @@ -0,0 +1,49 @@ +/* + * QEMU VGA Emulator templates + * + * Copyright (c) 2003 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +static inline uint8_t vga_read_byte(VGACommonState *vga, uint32_t addr) +{ + return vga->vram_ptr[addr & vga->vbe_size_mask]; +} + +static inline uint16_t vga_read_word_le(VGACommonState *vga, uint32_t addr) +{ + uint32_t offset =3D addr & vga->vbe_size_mask & ~1; + uint16_t *ptr =3D (uint16_t *)(vga->vram_ptr + offset); + return lduw_le_p(ptr); +} + +static inline uint16_t vga_read_word_be(VGACommonState *vga, uint32_t addr) +{ + uint32_t offset =3D addr & vga->vbe_size_mask & ~1; + uint16_t *ptr =3D (uint16_t *)(vga->vram_ptr + offset); + return lduw_be_p(ptr); +} + +static inline uint32_t vga_read_dword_le(VGACommonState *vga, uint32_t add= r) +{ + uint32_t offset =3D addr & vga->vbe_size_mask & ~3; + uint32_t *ptr =3D (uint32_t *)(vga->vram_ptr + offset); + return ldl_le_p(ptr); +} diff --git a/hw/display/vga-helpers.h b/hw/display/vga-helpers.h index 5a752b3f9efd..10e9cfd40a04 100644 --- a/hw/display/vga-helpers.h +++ b/hw/display/vga-helpers.h @@ -95,32 +95,6 @@ static void vga_draw_glyph9(uint8_t *d, int linesize, } while (--h); } =20 -static inline uint8_t vga_read_byte(VGACommonState *vga, uint32_t addr) -{ - return vga->vram_ptr[addr & vga->vbe_size_mask]; -} - -static inline uint16_t vga_read_word_le(VGACommonState *vga, uint32_t addr) -{ - uint32_t offset =3D addr & vga->vbe_size_mask & ~1; - uint16_t *ptr =3D (uint16_t *)(vga->vram_ptr + offset); - return lduw_le_p(ptr); -} - -static inline uint16_t vga_read_word_be(VGACommonState *vga, uint32_t addr) -{ - uint32_t offset =3D addr & vga->vbe_size_mask & ~1; - uint16_t *ptr =3D (uint16_t *)(vga->vram_ptr + offset); - return lduw_be_p(ptr); -} - -static inline uint32_t vga_read_dword_le(VGACommonState *vga, uint32_t add= r) -{ - uint32_t offset =3D addr & vga->vbe_size_mask & ~3; - uint32_t *ptr =3D (uint32_t *)(vga->vram_ptr + offset); - return ldl_le_p(ptr); -} - /* * 4 color mode */ diff --git a/hw/display/vga.c b/hw/display/vga.c index 573d223d46f0..82ebe5361096 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1009,6 +1009,7 @@ void vga_mem_writeb(VGACommonState *s, hwaddr addr, u= int32_t val) typedef void vga_draw_line_func(VGACommonState *s1, uint8_t *d, uint32_t srcaddr, int width); =20 +#include "vga-access.h" #include "vga-helpers.h" =20 /* return true if the palette was modified */ --=20 2.18.1 From nobody Tue Apr 30 09:45:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568884508; cv=none; d=zoho.com; s=zohoarc; b=CBFshX6x8Wqq1WLsoMomg6RmLSsIN47c9HgsrA0pu2FNF11eAghuOFwNnw4nyzI1i/slr0rY9PrC0NWFWXaxKlNFDeGpEvvsSG5T+ewVeqz2Vc/afSNXw0fO9I6nt0SB6wQvvG1yyMn5L32SElzq4wN7soCBIDePwiM43IeceRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568884508; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=hWpz+PmvqWZTR146xbfFHnmDocUAdNTMaDPqifaLQZY=; b=TIqmyqe1NGEnbfCNE6cH649qFVFHKjBmJcL4GY+bGly+Yg3E9YWkViDY753ZWUoHOldIvT1hMd+ogh1PtiIwt3wX9YC+mPlFsaMGbBiBuit9S0O83g4sZ95aIqVzNQHcj+kbKWp2zJ3S8EfTrAi9tzls508BV4p9THWwqHPP5nQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568884508654421.46378710603676; Thu, 19 Sep 2019 02:15:08 -0700 (PDT) Received: from localhost ([::1]:40590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAsWo-0008Vo-I7 for importer@patchew.org; Thu, 19 Sep 2019 05:15:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39819) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAsSg-0003r8-Du for qemu-devel@nongnu.org; Thu, 19 Sep 2019 05:10:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAsSe-0003RA-3u for qemu-devel@nongnu.org; Thu, 19 Sep 2019 05:10:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33836) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAsSd-0003QT-Sb for qemu-devel@nongnu.org; Thu, 19 Sep 2019 05:10:48 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB4D2307D853 for ; Thu, 19 Sep 2019 09:10:46 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-47.ams2.redhat.com [10.36.116.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3639819C6A; Thu, 19 Sep 2019 09:10:44 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 862CD17538; Thu, 19 Sep 2019 11:10:43 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 19 Sep 2019 11:10:43 +0200 Message-Id: <20190919091043.24503-3-kraxel@redhat.com> In-Reply-To: <20190919091043.24503-1-kraxel@redhat.com> References: <20190919091043.24503-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 19 Sep 2019 09:10:46 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] ati: use vga_read_byte in ati_cursor_define 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This makes sure reads are confined to vga video memory. v3: use uint32_t, fix cut+paste bug. v2: fix ati_cursor_draw_line too. Reported-by: xu hang Signed-off-by: Gerd Hoffmann Reviewed-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20190917111441.27405-3-kraxel@redhat.com --- hw/display/ati.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index 8f940eee221a..db3b2543163f 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "ati_int.h" #include "ati_regs.h" +#include "vga-access.h" #include "hw/qdev-properties.h" #include "vga_regs.h" #include "qemu/log.h" @@ -135,19 +136,19 @@ static void ati_vga_switch_mode(ATIVGAState *s) static void ati_cursor_define(ATIVGAState *s) { uint8_t data[1024]; - uint8_t *src; + uint32_t srcoff; int i, j, idx =3D 0; =20 if ((s->regs.cur_offset & BIT(31)) || s->cursor_guest_mode) { return; /* Do not update cursor if locked or rendered by guest */ } /* FIXME handle cur_hv_offs correctly */ - src =3D s->vga.vram_ptr + s->regs.cur_offset - - (s->regs.cur_hv_offs >> 16) - (s->regs.cur_hv_offs & 0xffff) * 1= 6; + srcoff =3D s->regs.cur_offset - + (s->regs.cur_hv_offs >> 16) - (s->regs.cur_hv_offs & 0xffff) * 16; for (i =3D 0; i < 64; i++) { for (j =3D 0; j < 8; j++, idx++) { - data[idx] =3D src[i * 16 + j]; - data[512 + idx] =3D src[i * 16 + j + 8]; + data[idx] =3D vga_read_byte(&s->vga, srcoff + i * 16 + j); + data[512 + idx] =3D vga_read_byte(&s->vga, srcoff + i * 16 + j= + 8); } } if (!s->cursor) { @@ -189,7 +190,7 @@ static void ati_cursor_invalidate(VGACommonState *vga) static void ati_cursor_draw_line(VGACommonState *vga, uint8_t *d, int scr_= y) { ATIVGAState *s =3D container_of(vga, ATIVGAState, vga); - uint8_t *src; + uint32_t srcoff; uint32_t *dp =3D (uint32_t *)d; int i, j, h; =20 @@ -199,13 +200,13 @@ static void ati_cursor_draw_line(VGACommonState *vga,= uint8_t *d, int scr_y) return; } /* FIXME handle cur_hv_offs correctly */ - src =3D s->vga.vram_ptr + s->cursor_offset + (scr_y - vga->hw_cursor_y= ) * 16; + srcoff =3D s->cursor_offset + (scr_y - vga->hw_cursor_y) * 16; dp =3D &dp[vga->hw_cursor_x]; h =3D ((s->regs.crtc_h_total_disp >> 16) + 1) * 8; for (i =3D 0; i < 8; i++) { uint32_t color; - uint8_t abits =3D src[i]; - uint8_t xbits =3D src[i + 8]; + uint8_t abits =3D vga_read_byte(vga, srcoff + i); + uint8_t xbits =3D vga_read_byte(vga, srcoff + i + 8); for (j =3D 0; j < 8; j++, abits <<=3D 1, xbits <<=3D 1) { if (abits & BIT(7)) { if (xbits & BIT(7)) { --=20 2.18.1