From nobody Fri Dec 19 19:55:41 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1621959468; cv=none; d=zohomail.com; s=zohoarc; b=PvGQqxDklbqNrNnl8i8LLZtgl5HRr1SfQPMjgdTPIWZ2UG1SdkPcQIFsLkK/3K4zyQsKSCVPg75vvC3w7sPxEFcvSNVou7Bd6345xEsSZFbO3I4AenXo8ShR5KvapToTaiYoe3LSa/lUSjaX2X0TNjJqMdzM/8CL5eD149ZEjyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621959468; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rm4zByqo3GfUyLZhPuxawqIm/WAD7fG88RsiMrmqesc=; b=IbmyXwHngimNYofGcnvLqzi+1Wkz/wxvzL0dngvVdML/c85vgzWSCA8Picx2JVlQSlX0+FYlgRKDihUVNwnzWmIodpk6cCIiIrGc6kopWp2kVIvOhdzbBLv+lYYpp59FMU03JlbuSpuU5Oqj7PkrnxgYd/16TSfEfv/4g8G56+Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621959468914120.93195948729044; Tue, 25 May 2021 09:17:48 -0700 (PDT) Received: from localhost ([::1]:54640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llZka-0000nC-2k for importer@patchew.org; Tue, 25 May 2021 12:17:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llYeU-0001qd-Mz for qemu-devel@nongnu.org; Tue, 25 May 2021 11:07:26 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]:51049) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llYeM-0006hg-2R for qemu-devel@nongnu.org; Tue, 25 May 2021 11:07:26 -0400 Received: by mail-pj1-x102e.google.com with SMTP id t11so17030062pjm.0 for ; Tue, 25 May 2021 08:07:16 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id z19sm2231943pjq.11.2021.05.25.08.07.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 08:07:15 -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 :mime-version:content-transfer-encoding; bh=rm4zByqo3GfUyLZhPuxawqIm/WAD7fG88RsiMrmqesc=; b=f98KlvBarWe4dX2K3N/EPfKeRzGtYR9/RIOVlcySco35XEplYDJ3Dg5syIoozbWmf3 UBe9uVpKDkz3IkYs0cd3uJnHvSfw3+ZYY3u+JcZDoP+zV98c2N0TROdmKFsbKZUM8shd rEHD5ZQt+zxJ4KY1pSPh7osf3ctur/qz/EERUI/bNk230XK5GAhZv4R7CLzBGy0QVWFA 7s7h6PRvoLn2Lzs9xlNSKAPXHgottrGIrJz0XXyuaW0MQ5wyIIabN13I0vKlpgV/s767 nquRghC31KAqOZQin+qqPX3R0b/KUG0vkELButv3lspWyrIuO5Pq4bQhBP91c7RGtOb5 cFTA== 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:mime-version:content-transfer-encoding; bh=rm4zByqo3GfUyLZhPuxawqIm/WAD7fG88RsiMrmqesc=; b=jrHomvQntdfXMl9uXQqQ4CwwOjLpjxG2ly5c5/SoO+bcuI24kjSojzh12lJ44WwN8N nn0X3y9xNMuMONlYRgUrSRK/GXCx9mUKi6UEzLF7rDoAeBTWLb0hawAn/o4sZWycXhpT rNIiokbFsCZEX6SZ7vH1foHchTQCHB7QmxpCz9V8bEuvulyVTCwKbfWW3+svQggjsOCB HBExtS4QJzHlZq0DeMVypNUE1/tzplBp5nMOhQk6ZrYr9FxitsTzjCNtpdXqRWo50baj UwKnyS8u6KDTFNMWtQ3adLhQyS7UUOhz8iaSLcX9Mr1g3Pmyc7XvHHWJ9KT3uTaXV6xh hnHw== X-Gm-Message-State: AOAM5322XBsNoFq+kO8KTd4gOlYHGlwr9q03YhGqC1GX73BFDFYceEZe ai5gFLEaMLeHdFk7DwFu/VDw232ewVl75w== X-Google-Smtp-Source: ABdhPJwQ4Rhl9vlqvRJEXguFGEWW37geHRxM90f6dkFzTNgD/tNNdfKuerYaAdLEtmuUku+sna4BbA== X-Received: by 2002:a17:90b:14cc:: with SMTP id jz12mr31527281pjb.210.1621955236036; Tue, 25 May 2021 08:07:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 13/28] softfloat: Convert floatx80_add/sub to FloatParts Date: Tue, 25 May 2021 08:06:51 -0700 Message-Id: <20210525150706.294968-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210525150706.294968-1-richard.henderson@linaro.org> References: <20210525150706.294968-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.google.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, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, david@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Since this is the first such, this includes all of the packing and unpacking routines as well. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- fpu/softfloat.c | 339 +++++++++++++++++++----------------------------- 1 file changed, 136 insertions(+), 203 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index d7477212be..073b0440eb 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -578,14 +578,14 @@ typedef struct { } FloatFmt; =20 /* Expand fields based on the size of exponent and fraction */ -#define FLOAT_PARAMS_(E, F) \ +#define FLOAT_PARAMS_(E) \ .exp_size =3D E, \ .exp_bias =3D ((1 << E) - 1) >> 1, \ - .exp_max =3D (1 << E) - 1, \ - .frac_size =3D F + .exp_max =3D (1 << E) - 1 =20 #define FLOAT_PARAMS(E, F) \ - FLOAT_PARAMS_(E, F), \ + FLOAT_PARAMS_(E), \ + .frac_size =3D F, \ .frac_shift =3D (-F - 1) & 63, \ .round_mask =3D (1ull << ((-F - 1) & 63)) - 1 =20 @@ -614,6 +614,18 @@ static const FloatFmt float128_params =3D { FLOAT_PARAMS(15, 112) }; =20 +#define FLOATX80_PARAMS(R) \ + FLOAT_PARAMS_(15), \ + .frac_size =3D R =3D=3D 64 ? 63 : R, \ + .frac_shift =3D 0, \ + .round_mask =3D R =3D=3D 64 ? -1 : (1ull << ((-R - 1) & 63)) - 1 + +static const FloatFmt floatx80_params[3] =3D { + [floatx80_precision_s] =3D { FLOATX80_PARAMS(23) }, + [floatx80_precision_d] =3D { FLOATX80_PARAMS(52) }, + [floatx80_precision_x] =3D { FLOATX80_PARAMS(64) }, +}; + /* Unpack a float to parts, but do not canonicalize. */ static void unpack_raw64(FloatParts64 *r, const FloatFmt *fmt, uint64_t ra= w) { @@ -648,6 +660,16 @@ static inline void float64_unpack_raw(FloatParts64 *p,= float64 f) unpack_raw64(p, &float64_params, f); } =20 +static void floatx80_unpack_raw(FloatParts128 *p, floatx80 f) +{ + *p =3D (FloatParts128) { + .cls =3D float_class_unclassified, + .sign =3D extract32(f.high, 15, 1), + .exp =3D extract32(f.high, 0, 15), + .frac_hi =3D f.low + }; +} + static void float128_unpack_raw(FloatParts128 *p, float128 f) { const int f_size =3D float128_params.frac_size - 64; @@ -1536,6 +1558,92 @@ static float128 float128_round_pack_canonical(FloatP= arts128 *p, return float128_pack_raw(p); } =20 +/* Returns false if the encoding is invalid. */ +static bool floatx80_unpack_canonical(FloatParts128 *p, floatx80 f, + float_status *s) +{ + /* Ensure rounding precision is set before beginning. */ + switch (s->floatx80_rounding_precision) { + case floatx80_precision_x: + case floatx80_precision_d: + case floatx80_precision_s: + break; + default: + g_assert_not_reached(); + } + + if (unlikely(floatx80_invalid_encoding(f))) { + float_raise(float_flag_invalid, s); + return false; + } + + floatx80_unpack_raw(p, f); + + if (likely(p->exp !=3D floatx80_params[floatx80_precision_x].exp_max))= { + parts_canonicalize(p, s, &floatx80_params[floatx80_precision_x]); + } else { + /* The explicit integer bit is ignored, after invalid checks. */ + p->frac_hi &=3D MAKE_64BIT_MASK(0, 63); + p->cls =3D (p->frac_hi =3D=3D 0 ? float_class_inf + : parts_is_snan_frac(p->frac_hi, s) + ? float_class_snan : float_class_qnan); + } + return true; +} + +static floatx80 floatx80_round_pack_canonical(FloatParts128 *p, + float_status *s) +{ + const FloatFmt *fmt =3D &floatx80_params[s->floatx80_rounding_precisio= n]; + uint64_t frac; + int exp; + + switch (p->cls) { + case float_class_normal: + if (s->floatx80_rounding_precision =3D=3D floatx80_precision_x) { + parts_uncanon_normal(p, s, fmt); + frac =3D p->frac_hi; + exp =3D p->exp; + } else { + FloatParts64 p64; + + p64.sign =3D p->sign; + p64.exp =3D p->exp; + frac_truncjam(&p64, p); + parts_uncanon_normal(&p64, s, fmt); + frac =3D p64.frac; + exp =3D p64.exp; + } + if (exp !=3D fmt->exp_max) { + break; + } + /* rounded to inf -- fall through to set frac correctly */ + + case float_class_inf: + /* x86 and m68k differ in the setting of the integer bit. */ + frac =3D floatx80_infinity_low; + exp =3D fmt->exp_max; + break; + + case float_class_zero: + frac =3D 0; + exp =3D 0; + break; + + case float_class_snan: + case float_class_qnan: + /* NaNs have the integer bit set. */ + frac =3D p->frac_hi | (1ull << 63); + exp =3D fmt->exp_max; + break; + + default: + g_assert_not_reached(); + } + + return packFloatx80(p->sign, exp, frac); +} + /* * Addition and subtraction */ @@ -1725,6 +1833,30 @@ float128 float128_sub(float128 a, float128 b, float_= status *status) return float128_addsub(a, b, status, true); } =20 +static floatx80 QEMU_FLATTEN +floatx80_addsub(floatx80 a, floatx80 b, float_status *status, bool subtrac= t) +{ + FloatParts128 pa, pb, *pr; + + if (!floatx80_unpack_canonical(&pa, a, status) || + !floatx80_unpack_canonical(&pb, b, status)) { + return floatx80_default_nan(status); + } + + pr =3D parts_addsub(&pa, &pb, status, subtract); + return floatx80_round_pack_canonical(pr, status); +} + +floatx80 floatx80_add(floatx80 a, floatx80 b, float_status *status) +{ + return floatx80_addsub(a, b, status, false); +} + +floatx80 floatx80_sub(floatx80 a, floatx80 b, float_status *status) +{ + return floatx80_addsub(a, b, status, true); +} + /* * Multiplication */ @@ -5734,205 +5866,6 @@ floatx80 floatx80_round_to_int(floatx80 a, float_st= atus *status) =20 } =20 -/*------------------------------------------------------------------------= ---- -| Returns the result of adding the absolute values of the extended double- -| precision floating-point values `a' and `b'. If `zSign' is 1, the sum is -| negated before being returned. `zSign' is ignored if the result is a Na= N. -| The addition is performed according to the IEC/IEEE Standard for Binary -| Floating-Point Arithmetic. -*-------------------------------------------------------------------------= ---*/ - -static floatx80 addFloatx80Sigs(floatx80 a, floatx80 b, bool zSign, - float_status *status) -{ - int32_t aExp, bExp, zExp; - uint64_t aSig, bSig, zSig0, zSig1; - int32_t expDiff; - - aSig =3D extractFloatx80Frac( a ); - aExp =3D extractFloatx80Exp( a ); - bSig =3D extractFloatx80Frac( b ); - bExp =3D extractFloatx80Exp( b ); - expDiff =3D aExp - bExp; - if ( 0 < expDiff ) { - if ( aExp =3D=3D 0x7FFF ) { - if ((uint64_t)(aSig << 1)) { - return propagateFloatx80NaN(a, b, status); - } - return a; - } - if ( bExp =3D=3D 0 ) --expDiff; - shift64ExtraRightJamming( bSig, 0, expDiff, &bSig, &zSig1 ); - zExp =3D aExp; - } - else if ( expDiff < 0 ) { - if ( bExp =3D=3D 0x7FFF ) { - if ((uint64_t)(bSig << 1)) { - return propagateFloatx80NaN(a, b, status); - } - return packFloatx80(zSign, - floatx80_infinity_high, - floatx80_infinity_low); - } - if ( aExp =3D=3D 0 ) ++expDiff; - shift64ExtraRightJamming( aSig, 0, - expDiff, &aSig, &zSig1 ); - zExp =3D bExp; - } - else { - if ( aExp =3D=3D 0x7FFF ) { - if ( (uint64_t) ( ( aSig | bSig )<<1 ) ) { - return propagateFloatx80NaN(a, b, status); - } - return a; - } - zSig1 =3D 0; - zSig0 =3D aSig + bSig; - if ( aExp =3D=3D 0 ) { - if ((aSig | bSig) & UINT64_C(0x8000000000000000) && zSig0 < aS= ig) { - /* At least one of the values is a pseudo-denormal, - * and there is a carry out of the result. */ - zExp =3D 1; - goto shiftRight1; - } - if (zSig0 =3D=3D 0) { - return packFloatx80(zSign, 0, 0); - } - normalizeFloatx80Subnormal( zSig0, &zExp, &zSig0 ); - goto roundAndPack; - } - zExp =3D aExp; - goto shiftRight1; - } - zSig0 =3D aSig + bSig; - if ( (int64_t) zSig0 < 0 ) goto roundAndPack; - shiftRight1: - shift64ExtraRightJamming( zSig0, zSig1, 1, &zSig0, &zSig1 ); - zSig0 |=3D UINT64_C(0x8000000000000000); - ++zExp; - roundAndPack: - return roundAndPackFloatx80(status->floatx80_rounding_precision, - zSign, zExp, zSig0, zSig1, status); -} - -/*------------------------------------------------------------------------= ---- -| Returns the result of subtracting the absolute values of the extended -| double-precision floating-point values `a' and `b'. If `zSign' is 1, the -| difference is negated before being returned. `zSign' is ignored if the -| result is a NaN. The subtraction is performed according to the IEC/IEEE -| Standard for Binary Floating-Point Arithmetic. -*-------------------------------------------------------------------------= ---*/ - -static floatx80 subFloatx80Sigs(floatx80 a, floatx80 b, bool zSign, - float_status *status) -{ - int32_t aExp, bExp, zExp; - uint64_t aSig, bSig, zSig0, zSig1; - int32_t expDiff; - - aSig =3D extractFloatx80Frac( a ); - aExp =3D extractFloatx80Exp( a ); - bSig =3D extractFloatx80Frac( b ); - bExp =3D extractFloatx80Exp( b ); - expDiff =3D aExp - bExp; - if ( 0 < expDiff ) goto aExpBigger; - if ( expDiff < 0 ) goto bExpBigger; - if ( aExp =3D=3D 0x7FFF ) { - if ( (uint64_t) ( ( aSig | bSig )<<1 ) ) { - return propagateFloatx80NaN(a, b, status); - } - float_raise(float_flag_invalid, status); - return floatx80_default_nan(status); - } - if ( aExp =3D=3D 0 ) { - aExp =3D 1; - bExp =3D 1; - } - zSig1 =3D 0; - if ( bSig < aSig ) goto aBigger; - if ( aSig < bSig ) goto bBigger; - return packFloatx80(status->float_rounding_mode =3D=3D float_round_dow= n, 0, 0); - bExpBigger: - if ( bExp =3D=3D 0x7FFF ) { - if ((uint64_t)(bSig << 1)) { - return propagateFloatx80NaN(a, b, status); - } - return packFloatx80(zSign ^ 1, floatx80_infinity_high, - floatx80_infinity_low); - } - if ( aExp =3D=3D 0 ) ++expDiff; - shift128RightJamming( aSig, 0, - expDiff, &aSig, &zSig1 ); - bBigger: - sub128( bSig, 0, aSig, zSig1, &zSig0, &zSig1 ); - zExp =3D bExp; - zSign ^=3D 1; - goto normalizeRoundAndPack; - aExpBigger: - if ( aExp =3D=3D 0x7FFF ) { - if ((uint64_t)(aSig << 1)) { - return propagateFloatx80NaN(a, b, status); - } - return a; - } - if ( bExp =3D=3D 0 ) --expDiff; - shift128RightJamming( bSig, 0, expDiff, &bSig, &zSig1 ); - aBigger: - sub128( aSig, 0, bSig, zSig1, &zSig0, &zSig1 ); - zExp =3D aExp; - normalizeRoundAndPack: - return normalizeRoundAndPackFloatx80(status->floatx80_rounding_precisi= on, - zSign, zExp, zSig0, zSig1, status= ); -} - -/*------------------------------------------------------------------------= ---- -| Returns the result of adding the extended double-precision floating-point -| values `a' and `b'. The operation is performed according to the IEC/IEEE -| Standard for Binary Floating-Point Arithmetic. -*-------------------------------------------------------------------------= ---*/ - -floatx80 floatx80_add(floatx80 a, floatx80 b, float_status *status) -{ - bool aSign, bSign; - - if (floatx80_invalid_encoding(a) || floatx80_invalid_encoding(b)) { - float_raise(float_flag_invalid, status); - return floatx80_default_nan(status); - } - aSign =3D extractFloatx80Sign( a ); - bSign =3D extractFloatx80Sign( b ); - if ( aSign =3D=3D bSign ) { - return addFloatx80Sigs(a, b, aSign, status); - } - else { - return subFloatx80Sigs(a, b, aSign, status); - } - -} - -/*------------------------------------------------------------------------= ---- -| Returns the result of subtracting the extended double-precision floating- -| point values `a' and `b'. The operation is performed according to the -| IEC/IEEE Standard for Binary Floating-Point Arithmetic. -*-------------------------------------------------------------------------= ---*/ - -floatx80 floatx80_sub(floatx80 a, floatx80 b, float_status *status) -{ - bool aSign, bSign; - - if (floatx80_invalid_encoding(a) || floatx80_invalid_encoding(b)) { - float_raise(float_flag_invalid, status); - return floatx80_default_nan(status); - } - aSign =3D extractFloatx80Sign( a ); - bSign =3D extractFloatx80Sign( b ); - if ( aSign =3D=3D bSign ) { - return subFloatx80Sigs(a, b, aSign, status); - } - else { - return addFloatx80Sigs(a, b, aSign, status); - } - -} - /*------------------------------------------------------------------------= ---- | Returns the result of multiplying the extended double-precision floating- | point values `a' and `b'. The operation is performed according to the --=20 2.25.1