From nobody Thu May 16 10:19:51 2024 Delivered-To: importer@patchew.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=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1672840036397124.8048368858781; Wed, 4 Jan 2023 05:47:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pD45t-0000jk-7x; Wed, 04 Jan 2023 08:46:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pD45r-0000i2-KB for qemu-devel@nongnu.org; Wed, 04 Jan 2023 08:46:11 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pD45n-0005jD-US for qemu-devel@nongnu.org; Wed, 04 Jan 2023 08:46:11 -0500 Received: from [2a00:23c4:8baa:1d00:e655:fde:753f:696a] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pD45P-00099q-0C; Wed, 04 Jan 2023 13:45:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=+NExVEUsO/FtSJRqUFSNIbZIfVKOaF8SHc030Q1OCBU=; b=R4bdqUcA6Vl1miy/qonWZFEY99 ZH4Qg1X5/qIQWb0k8TkU6ZKClr/w9J2wb05bS0m9bdjIq9ckC4lmGFL6L72A0jNP7ywJtF8/G2sae 5/SR77zZIVGoobK2TTZZ5MXy0PompzzqQfVnreLpPOo+KMabzpg4+lGG7dFU9gK6xB9IXItHLYajS v/ED+WY8uH16M/gVSXEhy8MKjb1MSjGBvljqt2pDljJ1zTnOrxq+/+40TT/pVjC6bn22Mr8bsZhbt xtljcM30lyddiLSufBcUwWrrk7AgZkd1X+M1O0aHzewBrIYhS6D2a4Xo5ZU5q4FFgPMGOSzszqr0O T/8D0v9bzOMEnEhAFhSSeOj6EaGPtV7q6Ufbzv7zQdiY+wH79ncgNsezUhC5GpjjQ36VnlNfgODfh 3MHNBdrdxE5vaGQ9yKCe+bpVGMOULzIiKJYktQBXFr73Jr07uy7QwZz/6dCWLcREu8cL+amdBhc89 eAHVGsTegPKepse93839Ci5DnINrWvFYvP8r3lhdDyBhEl+UmSCGHRaAJ0J941NdEd7cFSZwBlBYb SZAwfiVYMxIoMnAB5bP3/PCvNOGu/C+08IBhWMa77x53k2u50k3ZHZM1fUNAGl0eXXpr8lFynyv2E RKMEoUDYYWR7Nq1w2QIr+FdRUa1LIxJI0VRHnnbDA=; From: Mark Cave-Ayland To: laurent@vivier.eu, qemu-devel@nongnu.org Date: Wed, 4 Jan 2023 13:45:51 +0000 Message-Id: <20230104134554.138012-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230104134554.138012-1-mark.cave-ayland@ilande.co.uk> References: <20230104134554.138012-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8baa:1d00:e655:fde:753f:696a X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 1/4] target/m68k: pass quotient directly into make_quotient() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1672840036820100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland Reviewed-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index fdc4937e29..0932c464fd 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -515,16 +515,10 @@ uint32_t HELPER(fmovemd_ld_postinc)(CPUM68KState *env= , uint32_t addr, return fmovem_postinc(env, addr, mask, cpu_ld_float64_ra); } =20 -static void make_quotient(CPUM68KState *env, floatx80 val) +static void make_quotient(CPUM68KState *env, int32_t quotient) { - int32_t quotient; int sign; =20 - if (floatx80_is_any_nan(val)) { - return; - } - - quotient =3D floatx80_to_int32(val, &env->fp_status); sign =3D quotient < 0; if (sign) { quotient =3D -quotient; @@ -538,14 +532,22 @@ void HELPER(fmod)(CPUM68KState *env, FPReg *res, FPRe= g *val0, FPReg *val1) { res->d =3D floatx80_mod(val1->d, val0->d, &env->fp_status); =20 - make_quotient(env, res->d); + if (floatx80_is_any_nan(res->d)) { + return; + } + + make_quotient(env, floatx80_to_int32(res->d, &env->fp_status)); } =20 void HELPER(frem)(CPUM68KState *env, FPReg *res, FPReg *val0, FPReg *val1) { res->d =3D floatx80_rem(val1->d, val0->d, &env->fp_status); =20 - make_quotient(env, res->d); + if (floatx80_is_any_nan(res->d)) { + return; + } + + make_quotient(env, floatx80_to_int32(res->d, &env->fp_status)); } =20 void HELPER(fgetexp)(CPUM68KState *env, FPReg *res, FPReg *val) --=20 2.30.2 From nobody Thu May 16 10:19:51 2024 Delivered-To: importer@patchew.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=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1672840026007632.6859947818391; Wed, 4 Jan 2023 05:47:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pD45u-0000kq-To; Wed, 04 Jan 2023 08:46:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pD45s-0000jY-VP for qemu-devel@nongnu.org; Wed, 04 Jan 2023 08:46:12 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pD45r-0005jc-IA for qemu-devel@nongnu.org; Wed, 04 Jan 2023 08:46:12 -0500 Received: from [2a00:23c4:8baa:1d00:e655:fde:753f:696a] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pD45T-00099q-62; Wed, 04 Jan 2023 13:45:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=urnH/nksk2VYFBKaJEIgDfSOrV96F3Qktvfye9XAk0o=; b=YDHruyxS72acZyiYddGZcG1lDZ YgMzUEIUq4ctvwCBCNRp4B8Jcnb8biq5q8/3bybTdgkQ7L/9LM9j10A2fjbcP845MkCdgXOLqHSIU lDbRYb4ohqbZNS02ypnfj7SFq5pSUTb6ofB0acLE3PPUgW9W0EygsjgjzEzeomiu4EOi5nI2ORiz6 bwGOkb5HQxjxS/DIT5mpvw8ceB+3KsOHosilb4qeOHq+Dxss5Eze0KRkxpBo8/w8+pYdtukYpyYOD crwUHfaWHss57NZ7U42OQu420BdPD4+nB++Tmyxx/1aug25QxrREAvKg3crDhavvhiJ51hVR/pGPN S8DBHr95MyRJ3Zs+gvfVt9lsfDMnJtcVR7VvjFNLF7oMBSkKHGWfbJLmQ6Y5uUocK42EJuVOMK7Ot gi6m6aT52VP/xRfi3xQbuaejebdV0a/OyQLqXdkbohIWMJ2M4YapHfn5aemy7bcxe50xAu1YOsQFY gi0Pre4AkUH+wm4v+N3W9p01KhyLQFBL54m8VRtLoIBQcyPFZehRpyrcFbs5FKFkdDNvadcRzzpDl KZOcvOMd7plegQCOzhVIDmsjeP4cKKqAL5bStnsZnftz5tnDn8GZIJ+xXkBe/gymgub02xSZ29RPi 1ziuDre5liRH/eLowYTe8baVgtfTPi1XXklhm6Mv8=; From: Mark Cave-Ayland To: laurent@vivier.eu, qemu-devel@nongnu.org Date: Wed, 4 Jan 2023 13:45:52 +0000 Message-Id: <20230104134554.138012-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230104134554.138012-1-mark.cave-ayland@ilande.co.uk> References: <20230104134554.138012-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8baa:1d00:e655:fde:753f:696a X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 2/4] target/m68k: pass sign directly into make_quotient() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1672840026762100003 Content-Type: text/plain; charset="utf-8" This enables the quotient parameter to be changed from int32_t to uint32_t = and also allows the extra sign logic in make_quotient() to be removed. Signed-off-by: Mark Cave-Ayland Reviewed-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 0932c464fd..76b34b8988 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -515,39 +515,42 @@ uint32_t HELPER(fmovemd_ld_postinc)(CPUM68KState *env= , uint32_t addr, return fmovem_postinc(env, addr, mask, cpu_ld_float64_ra); } =20 -static void make_quotient(CPUM68KState *env, int32_t quotient) +static void make_quotient(CPUM68KState *env, int sign, uint32_t quotient) { - int sign; - - sign =3D quotient < 0; - if (sign) { - quotient =3D -quotient; - } - quotient =3D (sign << 7) | (quotient & 0x7f); env->fpsr =3D (env->fpsr & ~FPSR_QT_MASK) | (quotient << FPSR_QT_SHIFT= ); } =20 void HELPER(fmod)(CPUM68KState *env, FPReg *res, FPReg *val0, FPReg *val1) { + uint32_t quotient; + int sign; + res->d =3D floatx80_mod(val1->d, val0->d, &env->fp_status); =20 if (floatx80_is_any_nan(res->d)) { return; } =20 - make_quotient(env, floatx80_to_int32(res->d, &env->fp_status)); + sign =3D extractFloatx80Sign(res->d); + quotient =3D floatx80_to_int32(floatx80_abs(res->d), &env->fp_status); + make_quotient(env, sign, quotient); } =20 void HELPER(frem)(CPUM68KState *env, FPReg *res, FPReg *val0, FPReg *val1) { + uint32_t quotient; + int sign; + res->d =3D floatx80_rem(val1->d, val0->d, &env->fp_status); =20 if (floatx80_is_any_nan(res->d)) { return; } =20 - make_quotient(env, floatx80_to_int32(res->d, &env->fp_status)); + sign =3D extractFloatx80Sign(res->d); + quotient =3D floatx80_to_int32(floatx80_abs(res->d), &env->fp_status); + make_quotient(env, sign, quotient); } =20 void HELPER(fgetexp)(CPUM68KState *env, FPReg *res, FPReg *val) --=20 2.30.2 From nobody Thu May 16 10:19:51 2024 Delivered-To: importer@patchew.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=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1672840021822477.48089406315376; Wed, 4 Jan 2023 05:47:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pD465-0000nX-86; Wed, 04 Jan 2023 08:46:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pD45x-0000lM-MZ for qemu-devel@nongnu.org; Wed, 04 Jan 2023 08:46:18 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pD45v-0005k2-Qo for qemu-devel@nongnu.org; Wed, 04 Jan 2023 08:46:16 -0500 Received: from [2a00:23c4:8baa:1d00:e655:fde:753f:696a] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pD45X-00099q-Ac; Wed, 04 Jan 2023 13:45:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=wDW9JK1AgcVGUr+D3xl31PU0Giu2aBKt72xModsfxWY=; b=m9pCK4s9U3w8OtyygtXoZWKau6 k7vWGdAMnT5hUW1ozkZwF+qyyinKWvUqKpa5kigDeRr6ACG9GooSe+Cz4wKbp9INFmdzKwKrfESWE MRxGiC2psQPaTZWjV887IXOiB1tOOH37jFN0H3K2WDudQs3kGSxrcy5qbJBMwe4MACuB7+kn3zgC0 fbFLmgA4lAXM1w81EN416RXNEiM4m+TcRI3QupxSrMQJzxYlsiW+qLxTu/TXsmMAeOT5u4o9Z8Ma/ qp2X+BV2loAKzGJu8pj3DM6Wxr5c48aY3TcI77XcBQcj4yN6j3ml8A5A/vL3SWB4jqv60W2SKN2+u AMnSi9hJ8ZFy9t8aoDXQ77jWgRPizujX/DY+tYe6ZIA2c31qU9RZTDfn5FN4s6UruraFzicfy9Zfh qYKQqdQ1zhsqD9k8CbcoCUpI66Ia8+nsT9JkUXgWfCSAEV7IZVswAk50K+5w0Qa7W54nBmk4t+yuF fdQIl+bFxOsHSsw5ZQRabpye5PCKcc8xvuuZYq5opd2M4+EmPdaMSeliB7SlPwUJzWFS7qWaQ9sOn H8MTIqF3bezDEj3BCFG6cs9ntj43zGJDS9P0Jauce2HpFkBWb+p0EeVFgLJG9nO18tB9F0sd42oeK u4o0CCM2sFFzxaJgAPGc1j7nqeXiCCvMF2w7zyycg=; From: Mark Cave-Ayland To: laurent@vivier.eu, qemu-devel@nongnu.org Date: Wed, 4 Jan 2023 13:45:53 +0000 Message-Id: <20230104134554.138012-4-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230104134554.138012-1-mark.cave-ayland@ilande.co.uk> References: <20230104134554.138012-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8baa:1d00:e655:fde:753f:696a X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 3/4] target/m68k: fix FPSR quotient byte for fmod instruction X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1672840022724100006 Content-Type: text/plain; charset="utf-8" The FPSR quotient byte should be set to the value of the quotient and not t= he result. Switch from using floatx80_mod() to floatx80_modrem() which returns the quotient as a uint64_t which can be used for the quotient byte. Signed-off-by: Mark Cave-Ayland Reviewed-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 76b34b8988..5fd094a33c 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -523,17 +523,16 @@ static void make_quotient(CPUM68KState *env, int sign= , uint32_t quotient) =20 void HELPER(fmod)(CPUM68KState *env, FPReg *res, FPReg *val0, FPReg *val1) { - uint32_t quotient; - int sign; + uint64_t quotient; + int sign =3D extractFloatx80Sign(val1->d) ^ extractFloatx80Sign(val0->= d); =20 - res->d =3D floatx80_mod(val1->d, val0->d, &env->fp_status); + res->d =3D floatx80_modrem(val1->d, val0->d, true, "ient, + &env->fp_status); =20 if (floatx80_is_any_nan(res->d)) { return; } =20 - sign =3D extractFloatx80Sign(res->d); - quotient =3D floatx80_to_int32(floatx80_abs(res->d), &env->fp_status); make_quotient(env, sign, quotient); } =20 --=20 2.30.2 From nobody Thu May 16 10:19:51 2024 Delivered-To: importer@patchew.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=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1672840021461423.942124423643; Wed, 4 Jan 2023 05:47:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pD468-0000p4-Ig; Wed, 04 Jan 2023 08:46:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pD462-0000nY-2Z for qemu-devel@nongnu.org; Wed, 04 Jan 2023 08:46:24 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pD45z-0005kb-VM for qemu-devel@nongnu.org; Wed, 04 Jan 2023 08:46:21 -0500 Received: from [2a00:23c4:8baa:1d00:e655:fde:753f:696a] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pD45b-00099q-GM; Wed, 04 Jan 2023 13:45:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=zhFt+h2CfwgWS9+FNozC5b0VslIsJOgYuuoZXaWwYJA=; b=wyPKR0SZ/FYfzgKZVnoNKvk1kh e08UKKntbERbN8POlkbK2nGvs+b47MZGOEu1JUgql9mdb73lUfIK22USczpqWEoHlPRFURmWpaa4o GEPBK/2iksOUqEzh+EnJOvDgMK1VZ3InX8J+Rxm3jVYQ7w5Pb1fQCpRIQcOfHMr4zulrIVI4RW7+m LxLhz/bD0iBWJAI3DYETNw7IFxR9IRyrQoyTJqq2U+e0isQYkKtG5nviQOegM5Ds578fSRqO08UB2 YgyfiF0qIDb36f0xAZaosy+qcXeaI33qZnPe/KS96ynG90BSUQwzOMQtjj+sAaveR5NX8XYoZbTRt UsNs2kPsdqtVYXmZlbgrUJCCWa3/cxgSDITbM291H28oOHQhGJlW0s1PzDoKMfOQ8CVtPxbFdfrgr BaFYiZliOFevvQzjwIbryBZo6UfH1y3wPAwTXIp8/I1FlgijTGrw1BIzGzWTRHisWfhJDqQRPSGKe 0G3lY3GgdDS2YY+WBwMxXRABZP56MO0Z61PqR0886WkFMbQw4vtfpswEl0X/f8tMPG11J3VmkmYfj DkrseEpIWF0+l4coyzzrF0sKrDuXX9XOgaD7ydeihJ3txe42H123bDggh8S/RxZgRTTiVzXudCctq VMBN4MOh+7Yg+kH80BoQfqZbQRvjccLFOW568gkRA=; From: Mark Cave-Ayland To: laurent@vivier.eu, qemu-devel@nongnu.org Date: Wed, 4 Jan 2023 13:45:54 +0000 Message-Id: <20230104134554.138012-5-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230104134554.138012-1-mark.cave-ayland@ilande.co.uk> References: <20230104134554.138012-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8baa:1d00:e655:fde:753f:696a X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 4/4] target/m68k: fix FPSR quotient byte for frem instruction X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1672840022724100005 Content-Type: text/plain; charset="utf-8" The FPSR quotient byte should be set to the value of the quotient and not t= he result. Manually calculate the quotient in the frem helper in round to near= est even mode (note this is different from the quotient calculated internally f= or fmod), and use it to set the quotient byte accordingly. Signed-off-by: Mark Cave-Ayland Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1314 Reviewed-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 5fd094a33c..56f7400140 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -538,17 +538,25 @@ void HELPER(fmod)(CPUM68KState *env, FPReg *res, FPRe= g *val0, FPReg *val1) =20 void HELPER(frem)(CPUM68KState *env, FPReg *res, FPReg *val0, FPReg *val1) { + float_status fp_status; + FPReg fp_quot; uint32_t quotient; int sign; =20 + /* Calculate quotient directly using round to nearest mode */ + set_float_rounding_mode(float_round_nearest_even, &fp_status); + set_floatx80_rounding_precision( + get_floatx80_rounding_precision(&env->fp_status), &fp_status); + fp_quot.d =3D floatx80_div(val1->d, val0->d, &fp_status); + res->d =3D floatx80_rem(val1->d, val0->d, &env->fp_status); =20 - if (floatx80_is_any_nan(res->d)) { + if (floatx80_is_any_nan(fp_quot.d)) { return; } =20 - sign =3D extractFloatx80Sign(res->d); - quotient =3D floatx80_to_int32(floatx80_abs(res->d), &env->fp_status); + sign =3D extractFloatx80Sign(fp_quot.d); + quotient =3D floatx80_to_int32(floatx80_abs(fp_quot.d), &env->fp_statu= s); make_quotient(env, sign, quotient); } =20 --=20 2.30.2