From patchwork Wed Nov 1 13:17:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Platts X-Patchwork-Id: 13442835 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7E141C4332F for ; Wed, 1 Nov 2023 13:18:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyB6Z-00039X-RV; Wed, 01 Nov 2023 09:17:55 -0400 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 1qyB6Y-00035X-Gc; Wed, 01 Nov 2023 09:17:54 -0400 Received: from mail-centralusazlp170120005.outbound.protection.outlook.com ([2a01:111:f403:c111::5] helo=DM4PR02CU001.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyB6W-0003xt-Bh; Wed, 01 Nov 2023 09:17:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a83fFDWJx5YtOPcTCzRwHHqNAhWo6Fpd25B5lDnsAFLGV23Mo+dX0ohx36Jh9GmvdC5J6tVQGLHpJQUXgx+CmF2VGfLkG9GJMPqHHfIZJN/PJDkaevQYDpeyI4AOQ5Q8W7DshRmrvCc/IXVMxHgqQ9TOPDHqZV+f+i5KAApaCiPDj4YPjM9vkoHLwa3noOAD2ALsx+BS1ydpP6TDROYZ1/IMSisqZlaqSQb3iFUAtWoLUnifEDRlj8tJBcHN8vtDkfkQsGwIghumFtQah5I+V5pGIrDxaFXT2VoRBG54RrIqOTrrtf+lNvqtdR95XV6Ggu6utQ9aKX9BJMoeT2JMpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=P8IyNzTiZHZkZgeGLtBgYI15jnU8RxZFzsIrf+AnII4=; b=NQ1JzBwUZA0K/IfQeQMu9MtYJPu5+oFJSEv9/meymS5shB4bAVUghNsF/xx+x4RIcewbD0DEYTnQe+uR2Q8Iz4m0Fkf3IvFFjYWtdyIrHY2HLDOHPWYznl+GwOxFGl6uPybZmjx+zuZofJITHdzhvz5AX4QRE5Dxv1ZiRprYSmzEQNXmKTgKDnc4siZGf26WmT13HjaMovQk0NIEsjzcKejqnlY93Ga5Do0lkH5smeiU6N4iQZJZtqEFLMPtOXXy6v1ROwZh1XBkPlIiwPdBQzoYRDk2MQS/uxcCfQTf0jJjpr6gbnVxgogyhL+uR8pxw6kOAfTwAjjh06MaovrKDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P8IyNzTiZHZkZgeGLtBgYI15jnU8RxZFzsIrf+AnII4=; b=jwIC0kwCxo2odFyir4+v99dp2VtHd6Hd4nKnmK92BbJLyjlcRqknH/B5mSvxLZoVpr9jcA5bC63XBxIfhjnZwjVMlxItBcpnxe9g9SgetyToAk8yNeYmYttkgypTPLqOi54/aS9jIosEp/dhGpoBrdmyUXuAAm/dHKhen8nyYI/jxMnMUpRlfLVr9h+htJZm9Wj7XOYZ8EzytuAoN8+fi5SdNJviir0N+5hubNpjpXh0A5IVdMzRuIS1UuRWbSfGeyZ70dc/4ZHxXdmSZOLeOnbfOGzyBNLdSqzPT8I9aOTJ7uo6X6bntG0x0Y/2aa+20NTej4lyd5hk9HnWJNtthg== Received: from SN6PR05MB5837.namprd05.prod.outlook.com (2603:10b6:805:f4::20) by SA1PR05MB8692.namprd05.prod.outlook.com (2603:10b6:806:1cb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 1 Nov 2023 13:17:48 +0000 Received: from SN6PR05MB5837.namprd05.prod.outlook.com ([fe80::c41:7e67:640d:c47e]) by SN6PR05MB5837.namprd05.prod.outlook.com ([fe80::c41:7e67:640d:c47e%4]) with mapi id 15.20.6954.019; Wed, 1 Nov 2023 13:17:48 +0000 From: John Platts To: "qemu-ppc@nongnu.org" CC: "npiggin@gmail.com" , "danielhb413@gmail.com" , "clg@kaod.org" , "qemu-devel@nongnu.org" Subject: [PATCH RESEND] target/ppc: Fix bugs in VSX_CVT_FP_TO_INT and VSX_CVT_FP_TO_INT2 macros Thread-Topic: [PATCH RESEND] target/ppc: Fix bugs in VSX_CVT_FP_TO_INT and VSX_CVT_FP_TO_INT2 macros Thread-Index: AQHaDMWbcVgJ7+yYFk+PqNP1wbMvFw== Date: Wed, 1 Nov 2023 13:17:47 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [9WORXxdiU6y0dX7HKkACnseYT8PcLST1dwcdNlooeV84ffR1CbZmvLGvQQhrPGmp4OwpaRWz1TE=] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN6PR05MB5837:EE_|SA1PR05MB8692:EE_ x-ms-office365-filtering-correlation-id: 1846d916-d888-4429-1ab8-08dbdadcf15d x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: OwJ9AYM/E1iiFnpPgaispnPqRH00zk2xhoISZYCqe/UHgdfimJURFQbNEQ80d/o61E+qt7uZ3aiuxDFpP5sIFHbTOjXh9Ehq74zhtHqPHp047twd9j24xRayPLvCaEAurw3JgHzbCy/jUjMEaD5b91WLPqA+Yu1K6RaPEumylHpCwF/kUtAEr0B4bmr7QRDWN97rMMeiyqo0JKqAGLnPserCUFwNk7V29igfx2cVXwCAtMT7W8ifLqzlCWt1Yss36jetdtPvfsbH9DIT1/8GxxhrVpOgbKthyBFa1UVrQ4Z0URp3t/QBzFZ77aoKpACjaDDUeVRDP/2nSoIoiAW94ZM7yGj45Rn7uvoFqoC7oR89pn4zr1uObOHJz4iH5BxhdV8++TJE0Z2yOtcHoKs21cyAF/kFMQwAWgF8kUwpecflvkP5gGujzwt8rO3z+wZpT/dmCqs/dPXQFBpzHcokD7rv+3rVSeSDQ57pq/9EvFNRaxbLn9mmX4lD8KFY1lLqU0pZxYzP2PKl9AbUlriHvsuJiX098kDUouF53pL6HQL27HycK0X49o1u57k/JGjZkHv4L2JvO/aXVB8H3mtVXk8dJAe+5ubBQ+jGHcGo0vE= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?MMVgrRAA+La5d306znUbViU?= =?iso-8859-1?q?hWsfwwBDL6V8ltW6h0/NUraOhgffewmbGzir7zoOW5wdWSsrK543udL8Q3gk?= =?iso-8859-1?q?qwjNU0A832R5FlPTt1JziuJ/mYsiF4y9CXjWt5LOLOayvkzG3WHtUAHs6aXy?= =?iso-8859-1?q?afBypTy3d7fuOFfcOscdwEr16jvuTz6L1vDL/7Zne2090Kq52KUcAnMZZiCb?= =?iso-8859-1?q?MqbMuu7i9gdwFIoLRBHALxOXYSTtQI7w4pT62RvDHX0Ep0pOnkyRmmk0++KX?= =?iso-8859-1?q?63oUnRKlQB9pvSSLccOeGORAfpNyxBjSNPWeXX7H84dP8VKsEQTiTnm0dMEm?= =?iso-8859-1?q?n25WfI7BvZuBToGPMXxUxE3juaYpaYY4eB0Mas358CIoR9M56odPAfwtUkes?= =?iso-8859-1?q?oA8kpeu9pN3TYklfa2ZviZRz3ycPNizhuhHNQ5cMM8fapzlSC7HJ3nbTYwhW?= =?iso-8859-1?q?MEpZ5734RSJRa00JautBnX03dIHf1LHOijfR97zFpGfFFrhcqyRFPDJvOHr/?= =?iso-8859-1?q?ckZXuCBuhMuXGYVdWE9/j/m5D3sl4cYXh63lYZHgEk4vZ66tp5WsGqQvtTCn?= =?iso-8859-1?q?f+J7PE7apkmWJR9435ZRFb80Zht5g6mqFfkFEEnaOe+NAHZORRUKWhrxM3NV?= =?iso-8859-1?q?0SCq0ZBBEuxXTEYiM44Uq6AnmI+xwogfmQTY97c8ODcGEibgXVhXPBoeYS2O?= =?iso-8859-1?q?EvFVUPBwpCv0NV923sP/wzdWVDpqJY3weqKFq5TtHkWfvhSN5C5htTYe6a/N?= =?iso-8859-1?q?wh9ztqWnlDHsNlkTA51WoxOdmfR2JgeR7o+FMqt8j1u0sB45Sv7BwsDLvIOm?= =?iso-8859-1?q?ezaX2IlP8UMKS6OeWDVIyi30Rj7/l+k0ZBo9s1uyisUfTdfqiBVT5m1YIo8N?= =?iso-8859-1?q?vlm4KTMt2L5zGxFDcFBwSKIA0w+tI/8Zp/faYp97AQITJCLdhXVvUvxN6jxB?= =?iso-8859-1?q?w201tI5AlE+9KNw5uWwVvV38pVTWnvw3kWEJc15fPkzvj7Fb9dEQTC3Ey+PD?= =?iso-8859-1?q?RXVzeT2RwH+9SwqIyf17GfqyOW0HuBIu+P5poMIABN3BueIRhl7EPCg58oGs?= =?iso-8859-1?q?voza4jMB6/NinQtZWEEJXbdEYDFkz36fAYqrub5W/aEO8jytlPZw2ol0407n?= =?iso-8859-1?q?E0fvmKZEVeKLlL5HbSNx0Y/6m/MUSt5tu4iKIEUF8Sd9zfhpNQiy5Lo3WdhB?= =?iso-8859-1?q?lwRY9S6mrtceRFeH4Lwosd0xylOaZpitz2AzojG3FGWkB0V52e01spu22V45?= =?iso-8859-1?q?SY7dHXHS8XybOtocBOz4CuwISL3EFEzDE0dMesBf6ddl12g/BigYulY17CqS?= =?iso-8859-1?q?miPor8vZc7DR+s2krrAzqoF95q8R13AmAJQPu72I=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4823-7-msonline-outlook-84f76.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR05MB5837.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 1846d916-d888-4429-1ab8-08dbdadcf15d X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Nov 2023 13:17:47.9626 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR05MB8692 Received-SPF: pass client-ip=2a01:111:f403:c111::5; envelope-from=john_platts@hotmail.com; helo=DM4PR02CU001.outbound.protection.outlook.com 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, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The patch below fixes a bug in the VSX_CVT_FP_TO_INT and VSX_CVT_FP_TO_INT2 macros in target/ppc/fpu_helper.c where a non-NaN floating point value from the source vector is incorrectly converted to 0, 0x80000000, or 0x8000000000000000 instead of the expected value if a preceding source floating point value from the same source vector was a NaN. The bug in the VSX_CVT_FP_TO_INT and VSX_CVT_FP_TO_INT2 macros in target/ppc/fpu_helper.c was introduced with commit c3f24257. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1941 Signed-off-by: John Platts --- target/ppc/fpu_helper.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index 03150a0f10..d6c8583416 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -2880,19 +2880,21 @@ uint64_t helper_XSCVSPDPN(uint64_t xb) #define VSX_CVT_FP_TO_INT(op, nels, stp, ttp, sfld, tfld, sfi, rnan) \ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \ { \ + int all_flags = 0; \ ppc_vsr_t t = { }; \ int i, flags; \ \ - helper_reset_fpstatus(env); \ - \ for (i = 0; i < nels; i++) { \ + helper_reset_fpstatus(env); \ t.tfld = stp##_to_##ttp##_round_to_zero(xb->sfld, &env->fp_status); \ flags = env->fp_status.float_exception_flags; \ + all_flags |= flags; \ if (unlikely(flags & float_flag_invalid)) { \ t.tfld = float_invalid_cvt(env, flags, t.tfld, rnan, 0, GETPC());\ } \ } \ \ + env->fp_status.float_exception_flags = all_flags; \ *xt = t; \ do_float_check_status(env, sfi, GETPC()); \ } @@ -2945,15 +2947,16 @@ VSX_CVT_FP_TO_INT128(XSCVQPSQZ, int128, 0x8000000000000000ULL); #define VSX_CVT_FP_TO_INT2(op, nels, stp, ttp, sfi, rnan) \ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \ { \ + int all_flags = 0; \ ppc_vsr_t t = { }; \ int i, flags; \ \ - helper_reset_fpstatus(env); \ - \ for (i = 0; i < nels; i++) { \ + helper_reset_fpstatus(env); \ t.VsrW(2 * i) = stp##_to_##ttp##_round_to_zero(xb->VsrD(i), \ &env->fp_status); \ flags = env->fp_status.float_exception_flags; \ + all_flags |= flags; \ if (unlikely(flags & float_flag_invalid)) { \ t.VsrW(2 * i) = float_invalid_cvt(env, flags, t.VsrW(2 * i), \ rnan, 0, GETPC()); \ @@ -2961,6 +2964,7 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \ t.VsrW(2 * i + 1) = t.VsrW(2 * i); \ } \ \ + env->fp_status.float_exception_flags = all_flags; \ *xt = t; \ do_float_check_status(env, sfi, GETPC()); \ }