From nobody Tue Jul 28 06:52:32 2026 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=1777211194; cv=none; d=zohomail.com; s=zohoarc; b=T2kzVQL83KkSwpMnVuCglKgk66nJ331kcOla9VnouwF57u+kELeYTO41ZJLK2S4ZuHlOW8jQQ6xHUZJT9S7VN36q2XmNxSAoSI8X06PP7/1Iuax2a4LwJuOOmWlIBlbg44REaJEX68ndR6ZhowCeYl1+5kM3SrwFtYlezWMDcV0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777211194; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wkmJsSnzSIeu5aRXxhdaCCtrL9SrqbsTI14aS+J1vKY=; b=Rrkv7aX3rtKeJ+pGxrn5JKiw+gOvzDhcVvWFsthzmg/t8Xg+GdCRE6llXmsHDgkcj7J6y1OMYz6ZfwWYGD5Yl15eM2fGx3XbPMiN6VF9t+tNLcp1F/8PaP8XrCiKerU1VCIPyN6nrt1OUrp2Yc3WuBePB36cQMTOm+b5io2Spf0= 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) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777211194056308.3714463982444; Sun, 26 Apr 2026 06:46:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGzix-00071E-Px; Sun, 26 Apr 2026 09:40:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wGzig-0006sk-RJ for qemu-devel@nongnu.org; Sun, 26 Apr 2026 09:40:23 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wGzie-0008Gz-Qa for qemu-devel@nongnu.org; Sun, 26 Apr 2026 09:40:22 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2ab46931cf1so70757525ad.0 for ; Sun, 26 Apr 2026 06:40:20 -0700 (PDT) Received: from stoup.. ([180.233.125.15]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab30f29sm277940375ad.68.2026.04.26.06.40.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 06:40:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1777210819; x=1777815619; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wkmJsSnzSIeu5aRXxhdaCCtrL9SrqbsTI14aS+J1vKY=; b=gCqTIaqgBcFXbgxd5O5WwlXUC7zl++LqUqdvJVFsNcdSTzP9ogHEzCrlIg3sOpHiz4 FEDmFc+ieU4WRktixM3kq1zCmhaiQpBUOltll3EIKhyLXJuaD2b+UMB2BhD02yTZ/Rw0 XrYYwU1FIjTk1x+0IEUA9zlrAE0U/UfWY41gpgXzmYzuhGFlPW9ukbTRLYAGohN6p96B T18dU+60hMXINkh9D1QUjRMJjItzoCHPYm86SfgMKErz0/O8T7V6QT7Z7b2nzPY8Diof +dTZa3grknqmJJC9PPjSf9qRNTrQFPHXPi3XKRaMPoIU43CqDKFrQoki15E/vTtOEvsu B4pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777210819; x=1777815619; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wkmJsSnzSIeu5aRXxhdaCCtrL9SrqbsTI14aS+J1vKY=; b=cfsDnxRnsm3TQx+xOkEX43l7flsOqzMLCi1GhMNIm5WtNdGFmDDoPoSjmfHXd02mrt sz5AV4gmkiOdvd7kYApKrGjDY6yQTRPqKaJIwpVfZGJ027sEqV5cDo1qEqeD5TeQCp59 7rprqOhr76VwnR5aWZr/QMRNjxVtsSvmNp0h2IYP9WgEzf9clfa9PZfKvAQE3yxeE0/K 3xwC4VUL34Ob8/54IIx2OUGoTWKmVtGRfysoi4UBrMOwlh54GTN3/Hyv3iMn1kgsrAc+ wjLhg/atdTV1ed6O/Cme0ChzOX+A5B0Eo3hH02HBBsvc66ev81Qm4K2ra2nNHHjGef9C efqw== X-Gm-Message-State: AOJu0YzARY2uMFtdVQuGMypY2JTcO4dFlaE0KnP5HPQCquKf9ysgZlni 0qeyvAk2+5ghW1xv+4nm6vGsxiKM7WA6fq0ybhKa3XQF0qF4azwDKC1TyV+YgnOlAB2LfI6jUho wQwJ2eX8= X-Gm-Gg: AeBDietCUVYmzTzpgyCCXQOfo1YBsUkNpzYig0piZKVylSCOky9aylTNEV1sgLFYRq4 X71TMZsmCzwUQCSZ0pC+W0DLICloufpAPgLBoSX6qG4j/KC7lTExxyk3MyvfF0PB24OR0GMtXTM E+m9RcTThWfraj/NjWpzV2ZWahm+ME4L3MEPhp1mj2XLVg9+HLdttn/zDf0tcHQZZn3AFE23A7U vQHuNKMnndaIpxGHpyY0FqwVHMBJoSjRp6uR3fJbKEAXWB66F43iahEpASGElVogZZ5rO4roctY HO7971cgxolVei9NpFdVyvfxTvlkIpa/Bs9WXyGuN6tzOeWWJoLJXJMR2wYzBZn0RypC4Pj4pwk DS23v1usJA5Ab8WyiWlXtmM1yOHX87wIhVq8lmoiSa5/cevm2hLBjLGOsa20XYdUc5syFvqDsvb i5YXp+hIayy0WJgM3VGltk1B9rmGcijm9U83bzfLoGQ1oLVeeRBYQ= X-Received: by 2002:a17:903:3910:b0:2b7:88f9:9c28 with SMTP id d9443c01a7336-2b788f9a0c6mr204799165ad.5.1777210819079; Sun, 26 Apr 2026 06:40:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH 04/84] fpu: Drop parts_default_nan Date: Sun, 26 Apr 2026 23:38:41 +1000 Message-ID: <20260426134002.865628-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260426134002.865628-1-richard.henderson@linaro.org> References: <20260426134002.865628-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1777211194975158500 Content-Type: text/plain; charset="utf-8" Use parts{64,128}_default_nan at each call site. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- fpu/softfloat.c | 23 +++++++++++------------ fpu/softfloat-parts.c.inc | 24 ++++++++++++------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 4876a8bb27..76c1d4e38a 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -779,7 +779,6 @@ static float128 QEMU_FLATTEN float128_pack_raw(const Fl= oatParts128 *p) FloatParts128 *: parts128_##NAME, \ FloatParts256 *: parts256_##NAME) =20 -#define parts_default_nan(P, S) PARTS_GENERIC_64_128(default_nan, P)(P,= S) #define parts_silence_nan(P, S) PARTS_GENERIC_64_128(silence_nan, P)(P,= S) =20 static void parts64_return_nan(FloatParts64 *a, float_status *s); @@ -3156,7 +3155,7 @@ float32 floatx80_to_float32(floatx80 a, float_status = *s) if (floatx80_unpack_canonical(&p128, a, s)) { parts_float_to_float_narrow(&p64, &p128, s); } else { - parts_default_nan(&p64, s); + parts64_default_nan(&p64, s); } return float32_round_pack_canonical(&p64, s); } @@ -3169,7 +3168,7 @@ float64 floatx80_to_float64(floatx80 a, float_status = *s) if (floatx80_unpack_canonical(&p128, a, s)) { parts_float_to_float_narrow(&p64, &p128, s); } else { - parts_default_nan(&p64, s); + parts64_default_nan(&p64, s); } return float64_round_pack_canonical(&p64, s); } @@ -3181,7 +3180,7 @@ float128 floatx80_to_float128(floatx80 a, float_statu= s *s) if (floatx80_unpack_canonical(&p, a, s)) { parts_float_to_float(&p, s); } else { - parts_default_nan(&p, s); + parts128_default_nan(&p, s); } return float128_round_pack_canonical(&p, s); } @@ -3486,7 +3485,7 @@ static int32_t floatx80_to_int32_scalbn(floatx80 a, F= loatRoundMode rmode, FloatParts128 p; =20 if (!floatx80_unpack_canonical(&p, a, s)) { - parts_default_nan(&p, s); + parts128_default_nan(&p, s); } return parts_float_to_sint(&p, rmode, scale, INT32_MIN, INT32_MAX, s); } @@ -3497,7 +3496,7 @@ static int64_t floatx80_to_int64_scalbn(floatx80 a, F= loatRoundMode rmode, FloatParts128 p; =20 if (!floatx80_unpack_canonical(&p, a, s)) { - parts_default_nan(&p, s); + parts128_default_nan(&p, s); } return parts_float_to_sint(&p, rmode, scale, INT64_MIN, INT64_MAX, s); } @@ -4984,7 +4983,7 @@ float16 float16_default_nan(float_status *status) { FloatParts64 p; =20 - parts_default_nan(&p, status); + parts64_default_nan(&p, status); p.frac >>=3D float16_params.frac_shift; return float16_pack_raw(&p); } @@ -4993,7 +4992,7 @@ float32 float32_default_nan(float_status *status) { FloatParts64 p; =20 - parts_default_nan(&p, status); + parts64_default_nan(&p, status); p.frac >>=3D float32_params.frac_shift; return float32_pack_raw(&p); } @@ -5002,7 +5001,7 @@ float64 float64_default_nan(float_status *status) { FloatParts64 p; =20 - parts_default_nan(&p, status); + parts64_default_nan(&p, status); p.frac >>=3D float64_params.frac_shift; return float64_pack_raw(&p); } @@ -5011,7 +5010,7 @@ float128 float128_default_nan(float_status *status) { FloatParts128 p; =20 - parts_default_nan(&p, status); + parts128_default_nan(&p, status); frac_shr(&p, float128_params.frac_shift); return float128_pack_raw(&p); } @@ -5020,7 +5019,7 @@ bfloat16 bfloat16_default_nan(float_status *status) { FloatParts64 p; =20 - parts_default_nan(&p, status); + parts64_default_nan(&p, status); p.frac >>=3D bfloat16_params.frac_shift; return bfloat16_pack_raw(&p); } @@ -5537,7 +5536,7 @@ static void parts_s390_divide_to_integer(FloatParts64= *a, FloatParts64 *b, *n =3D *r; *cc =3D 1; } else if (a->cls =3D=3D float_class_inf || b->cls =3D=3D float_class_= zero) { - parts_default_nan(r, status); + parts64_default_nan(r, status); *n =3D *r; *cc =3D 1; status->float_exception_flags |=3D float_flag_invalid; diff --git a/fpu/softfloat-parts.c.inc b/fpu/softfloat-parts.c.inc index 948eb7bd6a..37ce731101 100644 --- a/fpu/softfloat-parts.c.inc +++ b/fpu/softfloat-parts.c.inc @@ -21,14 +21,14 @@ static void partsN(return_nan)(FloatPartsN *a, float_st= atus *s) case float_class_snan: float_raise(float_flag_invalid | float_flag_invalid_snan, s); if (s->default_nan_mode) { - parts_default_nan(a, s); + partsN(default_nan)(a, s); } else { parts_silence_nan(a, s); } break; case float_class_qnan: if (s->default_nan_mode) { - parts_default_nan(a, s); + partsN(default_nan)(a, s); } break; default: @@ -49,7 +49,7 @@ static FloatPartsN *partsN(pick_nan)(FloatPartsN *a, Floa= tPartsN *b, } =20 if (s->default_nan_mode) { - parts_default_nan(a, s); + partsN(default_nan)(a, s); return a; } =20 @@ -184,7 +184,7 @@ static FloatPartsN *partsN(pick_nan_muladd)(FloatPartsN= *a, FloatPartsN *b, return ret; =20 default_nan: - parts_default_nan(a, s); + partsN(default_nan)(a, s); return a; } =20 @@ -281,7 +281,7 @@ static void partsN(uncanon_e4m3_overflow)(FloatPartsN *= p, float_status *s, p->exp =3D fmt->exp_max; p->frac_hi =3D E4M3_NORMAL_FRAC_MAX; } else { - parts_default_nan(p, s); + partsN(default_nan)(p, s); } } =20 @@ -568,7 +568,7 @@ static FloatPartsN *partsN(addsub)(FloatPartsN *a, Floa= tPartsN *b, } /* Inf - Inf */ float_raise(float_flag_invalid | float_flag_invalid_isi, s); - parts_default_nan(a, s); + partsN(default_nan)(a, s); return a; } } else { @@ -641,7 +641,7 @@ static FloatPartsN *partsN(mul)(FloatPartsN *a, FloatPa= rtsN *b, /* Inf * Zero =3D=3D NaN */ if (unlikely(ab_mask =3D=3D float_cmask_infzero)) { float_raise(float_flag_invalid | float_flag_invalid_imz, s); - parts_default_nan(a, s); + partsN(default_nan)(a, s); return a; } =20 @@ -796,7 +796,7 @@ static FloatPartsN *partsN(muladd_scalbn)(FloatPartsN *= a, FloatPartsN *b, goto finish_sign; =20 d_nan: - parts_default_nan(a, s); + partsN(default_nan)(a, s); return a; } =20 @@ -864,7 +864,7 @@ static FloatPartsN *partsN(div)(FloatPartsN *a, FloatPa= rtsN *b, return a; =20 d_nan: - parts_default_nan(a, s); + partsN(default_nan)(a, s); return a; } =20 @@ -896,7 +896,7 @@ static FloatPartsN *partsN(modrem)(FloatPartsN *a, Floa= tPartsN *b, /* Inf % N; N % 0 */ if (a->cls =3D=3D float_class_inf || b->cls =3D=3D float_class_zero) { float_raise(float_flag_invalid, s); - parts_default_nan(a, s); + partsN(default_nan)(a, s); return a; } =20 @@ -1118,7 +1118,7 @@ static void partsN(sqrt)(FloatPartsN *a, float_status= *status, =20 d_nan: float_raise(float_flag_invalid | float_flag_invalid_sqrt, status); - parts_default_nan(a, status); + partsN(default_nan)(a, status); } =20 /* @@ -1879,5 +1879,5 @@ static void partsN(log2)(FloatPartsN *a, float_status= *s, const FloatFmt *fmt) =20 d_nan: float_raise(float_flag_invalid, s); - parts_default_nan(a, s); + partsN(default_nan)(a, s); } --=20 2.43.0