From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8079C3A59E for ; Wed, 21 Aug 2019 07:48:05 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A2D292339F for ; Wed, 21 Aug 2019 07:48:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="Onds5MDI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2D292339F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0LLg-0005EO-CG for qemu-devel@archiver.kernel.org; Wed, 21 Aug 2019 03:48:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42880) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0L1F-0005dT-2R for qemu-devel@nongnu.org; Wed, 21 Aug 2019 03:26:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0L1D-0000HU-Ou for qemu-devel@nongnu.org; Wed, 21 Aug 2019 03:26:56 -0400 Received: from ozlabs.org ([203.11.71.1]:41471) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i0L1D-0000FX-DV; Wed, 21 Aug 2019 03:26:55 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 46CzjH563Yz9sRJ; Wed, 21 Aug 2019 17:25:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1566372355; bh=LBLOm9mkU3pspBTmFyXrCZgMP0BWYNROIiCcVmX9xdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Onds5MDIWLIR+JZjWNuPMM2aZVmrb9DaNjvWQ6husp3AfaCXb9rXwgugzfVwD33gK pJTrUnlkjGsFzbCb6xkuKL612g7g5x2NwEIN7fWY/75X3CHYHmKsaMXrj8X/ciFy+a +mZPIekN3jgxvbhdShG9ohuegXNfNfxArbejVRMA= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 21 Aug 2019 17:25:41 +1000 Message-Id: <20190821072542.23090-42-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190821072542.23090-1-david@gibson.dropbear.id.au> References: <20190821072542.23090-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 41/42] ppc: Fix emulated INFINITY and NAN conversions 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: lvivier@redhat.com, aik@ozlabs.ru, Richard Henderson , qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, "Paul A. Clarke" , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Paul A. Clarke" helper_todouble() was not properly converting INFINITY from 32 bit float to 64 bit double. (Normalized operand conversion is unchanged, other than indentation.) Signed-off-by: Paul A. Clarke Message-Id: <1566242388-9244-1-git-send-email-pc@us.ibm.com> Reviewed-by: Richard Henderson Signed-off-by: David Gibson --- target/ppc/fpu_helper.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index 23b9c97439..52bcda27a6 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -58,10 +58,17 @@ uint64_t helper_todouble(uint32_t arg) uint64_t ret; =20 if (likely(abs_arg >=3D 0x00800000)) { - /* Normalized operand, or Inf, or NaN. */ - ret =3D (uint64_t)extract32(arg, 30, 2) << 62; - ret |=3D ((extract32(arg, 30, 1) ^ 1) * (uint64_t)7) << 59; - ret |=3D (uint64_t)extract32(arg, 0, 30) << 29; + if (unlikely(extract32(arg, 23, 8) =3D=3D 0xff)) { + /* Inf or NAN. */ + ret =3D (uint64_t)extract32(arg, 31, 1) << 63; + ret |=3D (uint64_t)0x7ff << 52; + ret |=3D (uint64_t)extract32(arg, 0, 23) << 29; + } else { + /* Normalized operand. */ + ret =3D (uint64_t)extract32(arg, 30, 2) << 62; + ret |=3D ((extract32(arg, 30, 1) ^ 1) * (uint64_t)7) << 59; + ret |=3D (uint64_t)extract32(arg, 0, 30) << 29; + } } else { /* Zero or Denormalized operand. */ ret =3D (uint64_t)extract32(arg, 31, 1) << 63; --=20 2.21.0