From nobody Sun Feb 8 23:32:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=pp1.inet.fi ARC-Seal: i=1; a=rsa-sha256; t=1592256214; cv=none; d=zohomail.com; s=zohoarc; b=JY/dNuL+hVkczcBKPE2u3IIke0jBSgbGjdPNIodk3985+wAyAktiZ52Tujv9Xa4gPSUEQ47uIEMoJPojuJv/cJa1pspIf2Yzpf3SAXkvNo625mO+qIHPgbirvoKLOow0j8xdrmb2VwsmGWwCjsWQ9IE2xg5gVb/OT3j20N14Xwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592256214; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=rky0uWWyHzwIwWIHqEoMJKWR7uwBiIZ749sMbJ9Wvrs=; b=FF0QXy7HuRQ/Z2cOnVvcByZMOOKVgxUSsF6IeuGl/XjsmyjQGYce7FTER6KieXyNkp458dMVxdnjNRlyD9/dSZzLl8B7uvovyuctNe8lwALF2TAPA/STsfPolkUhMnvWpA2bW8R3QBUJbew+Oy2Q9Q9hzWOa1K6KLYDZD/g2paQ= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 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 1592256214248597.226222527793; Mon, 15 Jun 2020 14:23:34 -0700 (PDT) Received: from localhost ([::1]:39664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkwZo-000633-VT for importer@patchew.org; Mon, 15 Jun 2020 17:23:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkvZ5-0004ql-IW; Mon, 15 Jun 2020 16:18:43 -0400 Received: from mta-out1.inet.fi ([62.71.2.202]:46608 helo=julia1.inet.fi) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkvZ2-0005Pm-Up; Mon, 15 Jun 2020 16:18:43 -0400 Received: from localhost.localdomain (91.154.154.51) by julia1.inet.fi (9.0.019.26-1) (authenticated as perall-2) id 5EE535C5000C63B7; Mon, 15 Jun 2020 23:18:04 +0300 From: Allan Peramaki To: qemu-devel@nongnu.org Subject: [PATCH] hw/audio/gus: Fix registers 32-bit access Date: Mon, 15 Jun 2020 23:17:57 +0300 Message-Id: <20200615201757.16868-1-aperamak@pp1.inet.fi> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=62.71.2.202; envelope-from=aperamak@pp1.inet.fi; helo=julia1.inet.fi X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 16:18:36 X-ACL-Warn: Detected OS = Linux 3.1-3.10 X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Mailman-Approved-At: Mon, 15 Jun 2020 17:16:08 -0400 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: qemu-trivial@nongnu.org, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Fix audio on software that accesses DRAM above 64k via register peek/poke and some cases when more than 16 voices are used. Fixes: 135f5ae1974c ("audio: GUSsample is int16_t") Signed-off-by: Allan Peramaki Reviewed-by: Peter Maydell Reviewed-by: Thomas Huth Reviewed-by: Volker R=C3=BCmelin --- hw/audio/gusemu_hal.c | 6 +++--- hw/audio/gusemu_mixer.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/audio/gusemu_hal.c b/hw/audio/gusemu_hal.c index ae40ca341c..e35e941926 100644 --- a/hw/audio/gusemu_hal.c +++ b/hw/audio/gusemu_hal.c @@ -30,9 +30,9 @@ #include "gustate.h" #include "gusemu.h" =20 -#define GUSregb(position) (* (gusptr+(position))) -#define GUSregw(position) (*(uint16_t *) (gusptr+(position))) -#define GUSregd(position) (*(uint16_t *)(gusptr+(position))) +#define GUSregb(position) (*(gusptr + (position))) +#define GUSregw(position) (*(uint16_t *)(gusptr + (position))) +#define GUSregd(position) (*(uint32_t *)(gusptr + (position))) =20 /* size given in bytes */ unsigned int gus_read(GUSEmuState * state, int port, int size) diff --git a/hw/audio/gusemu_mixer.c b/hw/audio/gusemu_mixer.c index 00b9861b92..3b39254518 100644 --- a/hw/audio/gusemu_mixer.c +++ b/hw/audio/gusemu_mixer.c @@ -26,11 +26,11 @@ #include "gusemu.h" #include "gustate.h" =20 -#define GUSregb(position) (* (gusptr+(position))) -#define GUSregw(position) (*(uint16_t *) (gusptr+(position))) -#define GUSregd(position) (*(uint16_t *)(gusptr+(position))) +#define GUSregb(position) (*(gusptr + (position))) +#define GUSregw(position) (*(uint16_t *)(gusptr + (position))) +#define GUSregd(position) (*(uint32_t *)(gusptr + (position))) =20 -#define GUSvoice(position) (*(uint16_t *)(voiceptr+(position))) +#define GUSvoice(position) (*(uint16_t *)(voiceptr + (position))) =20 /* samples are always 16bit stereo (4 bytes each, first right then left in= terleaved) */ void gus_mixvoices(GUSEmuState * state, unsigned int playback_freq, unsign= ed int numsamples, --=20 2.20.1