From nobody Wed Feb 11 00:59:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526423866032155.06513032647058; Tue, 15 May 2018 15:37:46 -0700 (PDT) Received: from localhost ([::1]:36368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIiZY-00033U-LR for importer@patchew.org; Tue, 15 May 2018 18:37:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIiOm-0003mF-SP for qemu-devel@nongnu.org; Tue, 15 May 2018 18:26:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIiOk-00007Q-BN for qemu-devel@nongnu.org; Tue, 15 May 2018 18:26:24 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:34162) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIiOj-0008RU-Vc for qemu-devel@nongnu.org; Tue, 15 May 2018 18:26:22 -0400 Received: by mail-pf0-x241.google.com with SMTP id a14-v6so744678pfi.1 for ; Tue, 15 May 2018 15:26:21 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-2-170.tukw.qwest.net. [97.113.2.170]) by smtp.gmail.com with ESMTPSA id g11-v6sm941419pgq.62.2018.05.15.15.26.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 May 2018 15:26:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y25lAzfnv8gI3ibuqOopXm3qR8DDCg/tqJ8Ij3Eb+FY=; b=Tte1pk7QoUcBiFFBYxFrBrLsDZ79/cG9LJiXAlyj3RKRL+ieAMIjk0hHYp2PN9fqww ZKlFX9FFRHoh8Y5wU9SuHAMhE7HkAG4F1C778rqzHuSjqx5HVt+vUC/Gr3Y2WAlwbQje 4q3o8QJza3UUArkvDaH4k6xpipIuszaLlHmHg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y25lAzfnv8gI3ibuqOopXm3qR8DDCg/tqJ8Ij3Eb+FY=; b=Y/keLwBXHTRWouYw4r/nL5DNa16fq05Yc/w14znFvWlaVb/8CcjgROiOGnITUY49eF d1A08KP3yPZz0CJlPa/OX1cXFS+TOCzwebe4xT0fzRqQfWq5tMc6l+cbGMn5fmOM92YG fSHlblb/mo9ZS13zSyrfVjCwnWkJNb8aF4CykswuHUY7YPQbBhYtJtTDQ1x0St/LnMbx ALlvvXiMwxde2eDAqNm62L8ioMVTHllvMbwrdL1dCDptc3hraJx68+YC/axmsDeWyXhN g0k6QdFDJKKhBShLBI9KRSlQVXqWWM6iVLM9iGetxFDisR/uqmDDFa6OIw0cbp8GuL49 I3+Q== X-Gm-Message-State: ALKqPwfFg27yr5/BtnM1vTL3wTlgW9qCh6uk1UxMUhEVyHJ1EtECyTln G6tOBGyQUknhLSBEwupNfUw2s4a6vJk= X-Google-Smtp-Source: AB8JxZon6hirt/R3TpNhSSj/y10X6Paksan+yyoVaFFiONBEahF9/juZNIiwgwqHb1dvzDBteWC/gQ== X-Received: by 2002:a63:aa07:: with SMTP id e7-v6mr9068003pgf.331.1526423180538; Tue, 15 May 2018 15:26:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 15 May 2018 15:25:38 -0700 Message-Id: <20180515222540.9988-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180515222540.9988-1-richard.henderson@linaro.org> References: <20180515222540.9988-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH v6 26/28] fpu/softfloat: Define floatN_default_nan in terms of parts_default_nan X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Isolate the target-specific choice to 2 functions instead of 6. The code in float16_default_nan was only correct for ARM, MIPS, and X86. Though float16 support is rare among our targets. The code in float128_default_nan was arguably wrong for Sparc. While QEMU supports the Sparc 128-bit insns, no real cpu enables it. The code in floatx80_default_nan tried to be over-general. There are only two targets that support this format: x86 and m68k. Thus there is no point in inventing a value for snan_bit_is_one. Move routines that no longer have ifdefs out of softfloat-specialize.h. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- v6 - shift the nan fraction into place before raw packing --- fpu/softfloat-specialize.h | 105 +++---------------------------------- fpu/softfloat.c | 41 +++++++++++++++ 2 files changed, 47 insertions(+), 99 deletions(-) diff --git a/fpu/softfloat-specialize.h b/fpu/softfloat-specialize.h index 0399dfe011..9d562ed504 100644 --- a/fpu/softfloat-specialize.h +++ b/fpu/softfloat-specialize.h @@ -179,94 +179,22 @@ static FloatParts parts_silence_nan(FloatParts a, flo= at_status *status) return a; } =20 -/*------------------------------------------------------------------------= ---- -| The pattern for a default generated half-precision NaN. -*-------------------------------------------------------------------------= ---*/ -float16 float16_default_nan(float_status *status) -{ -#if defined(TARGET_ARM) - return const_float16(0x7E00); -#else - if (snan_bit_is_one(status)) { - return const_float16(0x7DFF); - } else { -#if defined(TARGET_MIPS) - return const_float16(0x7E00); -#else - return const_float16(0xFE00); -#endif - } -#endif -} - -/*------------------------------------------------------------------------= ---- -| The pattern for a default generated single-precision NaN. -*-------------------------------------------------------------------------= ---*/ -float32 float32_default_nan(float_status *status) -{ -#if defined(TARGET_SPARC) || defined(TARGET_M68K) - return const_float32(0x7FFFFFFF); -#elif defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_ALPHA) = || \ - defined(TARGET_XTENSA) || defined(TARGET_S390X) || \ - defined(TARGET_TRICORE) || defined(TARGET_RISCV) - return const_float32(0x7FC00000); -#elif defined(TARGET_HPPA) - return const_float32(0x7FA00000); -#else - if (snan_bit_is_one(status)) { - return const_float32(0x7FBFFFFF); - } else { -#if defined(TARGET_MIPS) - return const_float32(0x7FC00000); -#else - return const_float32(0xFFC00000); -#endif - } -#endif -} - -/*------------------------------------------------------------------------= ---- -| The pattern for a default generated double-precision NaN. -*-------------------------------------------------------------------------= ---*/ -float64 float64_default_nan(float_status *status) -{ -#if defined(TARGET_SPARC) || defined(TARGET_M68K) - return const_float64(LIT64(0x7FFFFFFFFFFFFFFF)); -#elif defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_ALPHA) = || \ - defined(TARGET_S390X) || defined(TARGET_RISCV) - return const_float64(LIT64(0x7FF8000000000000)); -#elif defined(TARGET_HPPA) - return const_float64(LIT64(0x7FF4000000000000)); -#else - if (snan_bit_is_one(status)) { - return const_float64(LIT64(0x7FF7FFFFFFFFFFFF)); - } else { -#if defined(TARGET_MIPS) - return const_float64(LIT64(0x7FF8000000000000)); -#else - return const_float64(LIT64(0xFFF8000000000000)); -#endif - } -#endif -} - /*------------------------------------------------------------------------= ---- | The pattern for a default generated extended double-precision NaN. *-------------------------------------------------------------------------= ---*/ floatx80 floatx80_default_nan(float_status *status) { floatx80 r; + + /* None of the targets that have snan_bit_is_one use floatx80. */ + assert(!snan_bit_is_one(status)); #if defined(TARGET_M68K) r.low =3D LIT64(0xFFFFFFFFFFFFFFFF); r.high =3D 0x7FFF; #else - if (snan_bit_is_one(status)) { - r.low =3D LIT64(0xBFFFFFFFFFFFFFFF); - r.high =3D 0x7FFF; - } else { - r.low =3D LIT64(0xC000000000000000); - r.high =3D 0xFFFF; - } + /* X86 */ + r.low =3D LIT64(0xC000000000000000); + r.high =3D 0xFFFF; #endif return r; } @@ -285,27 +213,6 @@ floatx80 floatx80_default_nan(float_status *status) const floatx80 floatx80_infinity =3D make_floatx80_init(floatx80_infinity_high, floatx80_infinity_low); =20 -/*------------------------------------------------------------------------= ---- -| The pattern for a default generated quadruple-precision NaN. -*-------------------------------------------------------------------------= ---*/ -float128 float128_default_nan(float_status *status) -{ - float128 r; - - if (snan_bit_is_one(status)) { - r.low =3D LIT64(0xFFFFFFFFFFFFFFFF); - r.high =3D LIT64(0x7FFF7FFFFFFFFFFF); - } else { - r.low =3D LIT64(0x0000000000000000); -#if defined(TARGET_S390X) || defined(TARGET_PPC) || defined(TARGET_RISCV) - r.high =3D LIT64(0x7FFF800000000000); -#else - r.high =3D LIT64(0xFFFF800000000000); -#endif - } - return r; -} - /*------------------------------------------------------------------------= ---- | Raises the exceptions specified by `flags'. Floating-point traps can be | defined here if desired. It is currently not possible for such a trap diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 8e97602ace..c8b33e35f4 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -2092,6 +2092,47 @@ float64 __attribute__((flatten)) float64_sqrt(float6= 4 a, float_status *status) return float64_round_pack_canonical(pr, status); } =20 +/*------------------------------------------------------------------------= ---- +| The pattern for a default generated NaN. +*-------------------------------------------------------------------------= ---*/ + +float16 float16_default_nan(float_status *status) +{ + FloatParts p =3D parts_default_nan(status); + p.frac >>=3D float16_params.frac_shift; + return float16_pack_raw(p); +} + +float32 float32_default_nan(float_status *status) +{ + FloatParts p =3D parts_default_nan(status); + p.frac >>=3D float32_params.frac_shift; + return float32_pack_raw(p); +} + +float64 float64_default_nan(float_status *status) +{ + FloatParts p =3D parts_default_nan(status); + p.frac >>=3D float64_params.frac_shift; + return float64_pack_raw(p); +} + +float128 float128_default_nan(float_status *status) +{ + FloatParts p =3D parts_default_nan(status); + float128 r; + + /* Extrapolate from the choices made by parts_default_nan to fill + * in the quad-floating format. If the low bit is set, assume we + * want to set all non-snan bits. + */ + r.low =3D -(p.frac & 1); + r.high =3D p.frac >> (DECOMPOSED_BINARY_POINT - 48); + r.high |=3D LIT64(0x7FFF000000000000); + r.high |=3D (uint64_t)p.sign << 63; + + return r; +} =20 /*------------------------------------------------------------------------= ---- | Takes a 64-bit fixed-point value `absZ' with binary point between bits 6 --=20 2.17.0