From patchwork Mon May 14 22:12:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135777 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp198169lji; Mon, 14 May 2018 15:28:29 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo+BX3nI3FLLHQO1mMoa08210ne4i9mR64Xyr8nl4IRtgpWS/PzVJnpDN0v+Hvc+8r2qAPZ X-Received: by 2002:aed:3eee:: with SMTP id o43-v6mr10580666qtf.3.1526336909134; Mon, 14 May 2018 15:28:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526336909; cv=none; d=google.com; s=arc-20160816; b=syCTqvU7/OzBajH/nxDpKPCUVoi9oIQlWgdyNMyk+GqztIAdvcxlHEEltvGHpSjsW3 iYoqr2aDXBkEQUM4H8SLLij4Mu/+iBxihsVBUGZq6RYNQ7UkxBEIUuqjtXPv9v0C39vX s+jbGorLH9GNLuhQq3F2qFqESWRaV/mxSo7M3q5ORWKGL1dC+vV0Lyd55H0gcC47Mavl e1DqmYCA4yQ7By7PosW6NTlgWDuidQHmFOGcJOrhU79mZLwWjU4iczeuW2wzKR3mupZa e5bbv+dhWIR0lebn2oITlWY+RsLIdkmK4zyC6CbJmaN96+a1Gte0hZBEFJGlm6HLHY2H t+Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=tSLVnkHv3Kd/+xdpFOzuYurgmMTBI9n4hg87yMUQ/60=; b=XUbqLOdrl5HF0P1p4G54V9UASJBc+REXRqqDQO0n4AFODI7pcotfViHP4aiBYTW8FG 9OV9yE6gacsMkK1gjo/kIoMrYhBZR2KgeNaMqDlpo/EkNDmN19rN4YPr9/nnFpcvN+3a 8naHlcTws7MFIvGCFMhjbAS9PX+7QOtiHsnknLWrdkOQJHhXvdyhwHEBiE0wJeElD01z GzGWfgbuxHnTk+idjHmypTs1/k4gGb8izd+yacUgR5JtKGtf4khRsfs8LyMB5tt7NpN7 yMYobtX5+JmncdHo2R584fWJaxn3kFUtXMd3w+8aFHRonE/XarmA1h+8VEvdhMYWJ3HV Y3hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GDXRGPmQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m25-v6si763808qtn.124.2018.05.14.15.28.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 14 May 2018 15:28:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GDXRGPmQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fILxE-0004jH-H2 for patch@linaro.org; Mon, 14 May 2018 18:28:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fILiG-0008HZ-Iz for qemu-devel@nongnu.org; Mon, 14 May 2018 18:13:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fILiF-00008a-3Z for qemu-devel@nongnu.org; Mon, 14 May 2018 18:13:00 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:37438) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fILiE-00006M-Rg for qemu-devel@nongnu.org; Mon, 14 May 2018 18:12:59 -0400 Received: by mail-pf0-x244.google.com with SMTP id e9-v6so6669644pfi.4 for ; Mon, 14 May 2018 15:12:58 -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=tSLVnkHv3Kd/+xdpFOzuYurgmMTBI9n4hg87yMUQ/60=; b=GDXRGPmQLnEoaRDsgrwT1pFP1KnURwDgwOy8M9nxL8KaUDY5a1y4Qz+O5nPaLk5moP 7ES3LNnYBZNmICYrbWuAZDwiSXqG/WztKL0Z4pVaAxRdANRcQCJn3hueFEVdxLjc3eoB daq8v08o2GqG2GEJDhTPrQPNXkb0IoWi0M73A= 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=tSLVnkHv3Kd/+xdpFOzuYurgmMTBI9n4hg87yMUQ/60=; b=QzEsWzmzMGOB6RJRNx586lNyg1Z7DaJk/6PmquCoL6xNY+rHHQIb6J9IL1ratoE7kP YbV1nw4cBZNWmCZhPCG/XgpQrNhi31FaBctcsX2nPwVMqFJkwhldSTgTprblmRBxOm5F bdYw0+W0j9JqkBJA+RGiREaJlHNoFIUvnWmWTf8ehk4X21Lbx3RAOA7VF+TM71ZXCBQL VR27ydSdkcL4H8A78qtaZWSO37c7WnoRnjT+G5LXM5j+U//+zRb8XTmLCUagU4UPOdA5 46/OnjZA8erzITggVIP/wHmXBdIKqWVqC8WBVfSN9fjmZsIruyl/g9AtldEMk8mWLOuB OcjA== X-Gm-Message-State: ALKqPwcs+KW+O2h16QWPRrpz0IlIFvICy72f4in21wFcAfOwMCPItqrR WLqbK+0/jjz7yjwU7iaSDZ2CY5C4bFM= X-Received: by 2002:a63:5f11:: with SMTP id t17-v6mr8332307pgb.94.1526335977527; Mon, 14 May 2018 15:12:57 -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 y2-v6sm14512457pgp.92.2018.05.14.15.12.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 May 2018 15:12:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 15:12:17 -0700 Message-Id: <20180514221219.7091-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514221219.7091-1-richard.henderson@linaro.org> References: <20180514221219.7091-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::244 Subject: [Qemu-devel] [PATCH v5 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- fpu/softfloat-specialize.h | 105 +++---------------------------------- fpu/softfloat.c | 35 +++++++++++++ 2 files changed, 41 insertions(+), 99 deletions(-) -- 2.17.0 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, float_status *status) return a; } -/*---------------------------------------------------------------------------- -| 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 = LIT64(0xFFFFFFFFFFFFFFFF); r.high = 0x7FFF; #else - if (snan_bit_is_one(status)) { - r.low = LIT64(0xBFFFFFFFFFFFFFFF); - r.high = 0x7FFF; - } else { - r.low = LIT64(0xC000000000000000); - r.high = 0xFFFF; - } + /* X86 */ + r.low = LIT64(0xC000000000000000); + r.high = 0xFFFF; #endif return r; } @@ -285,27 +213,6 @@ floatx80 floatx80_default_nan(float_status *status) const floatx80 floatx80_infinity = make_floatx80_init(floatx80_infinity_high, floatx80_infinity_low); -/*---------------------------------------------------------------------------- -| 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 = LIT64(0xFFFFFFFFFFFFFFFF); - r.high = LIT64(0x7FFF7FFFFFFFFFFF); - } else { - r.low = LIT64(0x0000000000000000); -#if defined(TARGET_S390X) || defined(TARGET_PPC) || defined(TARGET_RISCV) - r.high = LIT64(0x7FFF800000000000); -#else - r.high = 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 65e970eeb2..b5842f7b1c 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -2092,6 +2092,41 @@ float64 __attribute__((flatten)) float64_sqrt(float64 a, float_status *status) return float64_round_pack_canonical(pr, status); } +/*---------------------------------------------------------------------------- +| The pattern for a default generated NaN. +*----------------------------------------------------------------------------*/ + +float16 float16_default_nan(float_status *status) +{ + return float16_pack_raw(parts_default_nan(status)); +} + +float32 float32_default_nan(float_status *status) +{ + return float32_pack_raw(parts_default_nan(status)); +} + +float64 float64_default_nan(float_status *status) +{ + return float64_pack_raw(parts_default_nan(status)); +} + +float128 float128_default_nan(float_status *status) +{ + FloatParts p = 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 = -(p.frac & 1); + r.high = p.frac >> (DECOMPOSED_BINARY_POINT - 48); + r.high |= LIT64(0x7FFF000000000000); + r.high |= (uint64_t)p.sign << 63; + + return r; +} /*---------------------------------------------------------------------------- | Takes a 64-bit fixed-point value `absZ' with binary point between bits 6