From nobody Sun Jul 26 15:48:13 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=1777211307; cv=none; d=zohomail.com; s=zohoarc; b=A11J2L+C6mxppjSdkDUFQQA9Q1jdwrjpFRJ/xfZisILsXMhRQIegFXXdyqroOjew7ZKBkqUDwUPayIFyTAl1XeQPwUw0hDHxz1nAWKLlSMhN+XKin2ba4/0dQGSwfUDypZiljyLQreY7oIuPmkucxeTNtbvC0Lt4//lTf8fb8Nw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777211307; 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=i0Sl15CbZuOenLUjRBqqIJLCi1jF+twJX10P6o1IkLU=; b=CRbSOZgE+4PCF4lnwKng/SG799TwtMJMgwRXG7xcSerqoEPAgkhGVReZvXlHmVgz+71FPd8j6Cj4ma8FPYo4f+lm1m1HC2Qt4z7qaPsoxZHa5tIn0SSGTiazb13obP7N6PdPrOlh/Xgsjmxg8DTQaNMxxLqP7bM1VenQfYxlKy0= 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 1777211307314578.9323294342877; Sun, 26 Apr 2026 06:48:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGznO-0005Rc-TG; Sun, 26 Apr 2026 09:45:16 -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 1wGznL-0005HF-1G for qemu-devel@nongnu.org; Sun, 26 Apr 2026 09:45:11 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wGznH-0001FB-2g for qemu-devel@nongnu.org; Sun, 26 Apr 2026 09:45:09 -0400 Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-362e50b4641so1620316a91.0 for ; Sun, 26 Apr 2026 06:45:06 -0700 (PDT) Received: from stoup.. ([180.233.125.15]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5faa34ea7sm280544085ad.34.2026.04.26.06.45.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 06:45:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1777211106; x=1777815906; 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=i0Sl15CbZuOenLUjRBqqIJLCi1jF+twJX10P6o1IkLU=; b=wOwxHjl9cghebyaUsvxIPjrRUgglyGsauRVYxoYHO1gq/0HrDU1eHpH12hh4QJ05WA pzvz6G4QzDBJGXOGbhMWfCASik9lUgAVph4OCWZVlS3tCQ5yMIY0bCqGiKr8nWI4znRC ihQ6XD4OuU+SIAPuyylEb8QNKZKBhyTZoWriRwC/J/rVDyLcSOfuc5rT0tqLT0dfdgKI WJCfJmti9wX1v2DWaVsTyBAfeXRMvYvJ4zIjMcvCukCrOVB/1eSUO9uk1pPSsWoPFJld xkjcVc1IREHHrrzSh1GS1oFLq7MsCgjyks2wEEt5FXvgOyG0fo4wfviPNMTOX8jq3Hgk afxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777211106; x=1777815906; 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=i0Sl15CbZuOenLUjRBqqIJLCi1jF+twJX10P6o1IkLU=; b=drSMDso/uRN+XbPDc1/xj9jv5I+oeQDuCQqDu1Cd3xW/s0989RQHRXQJq5j+00nuHO JdYgQnNYgT+QRnpcS93nRzZ6W47VCsoXLi0/5xzobi35e4bJR9x850s6rD8hLE71AFmK jiO9JnG1F+RbykD1WpBgMKkdCFQP8vCxbQ5hjPcg6aRAGgpETnrG2yux/h8H5QQmC7Fy LNWn0lBs4CC5jJQI9ABzO0OsSkTaZT2raGwjsHxupWMuiNTED3xipnIYUphzY4/ygzHC l0vJlAhcjYP8dOo+VbUS2d1mXQu1YJ51/uZxNEgPGpXPE4aOuGf38BUQiLJaFoslfiyJ 3MoQ== X-Gm-Message-State: AOJu0YzzJNXiod+LC+O2/7TWBONeUhmYVP9xzSOrmDoyM9TLx2xXbNuR Ka6YWypgXs/zlHmoeqDdP1X9Nv5sk7MUoaSXjU3v6Prgp+VKaC8xdklu+dJadE1Oj9tI9EWLEbp g/EsPkvE= X-Gm-Gg: AeBDietnQn+O2b+FC/C+E9v5MTWAfbwxYomaYCfE5EUjlhlaMvzP/aqIK/Y9+mnQP+w Xp47USBagfPbeloslJBA/4bDd+V4aDdV91HSW00YEW+PdjDpIE/GOSQF72/+gmv/AiUlZqvezKu dk/b0wtX9Njysd9MrXFsF66sIKKkaWrsmMHe6oNdyGTWNS5qFd7LMGVxqY0rTEyVgmE0SXF+5GT JoRSi2xu+oHT9MbGTnDlVWwbGQA41zBmKqfUFX84nvwn8oBnZmxuI4q5O1iR3eftEFJ45M8NjfC d1/YUcHCRHM6W4UPpp219A+QZWJ1XZVWWXlI69QzbaYxxB8uz7z32aySOv5gs6ZMTm7eDxvksDG LPejckrzCx1WhvP8Kn6V6ur4kRL+R0sUlBhef/NRVbiaAcQ6BNRGhGtZzbk48atNf3CH3tvUY45 z3nIMWAmXSUeTnMgjgTi4LPbnfhMYKG2JiP2jd+cwK X-Received: by 2002:a17:903:907:b0:2ae:54b2:27c7 with SMTP id d9443c01a7336-2b5f9fecc37mr394644285ad.39.1777211105496; Sun, 26 Apr 2026 06:45:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH 43/84] fpu: Return struct from float{32,64}_unpack_canonical Date: Sun, 26 Apr 2026 23:39:20 +1000 Message-ID: <20260426134002.865628-44-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::102d; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102d.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: 1777211309148154100 Content-Type: text/plain; charset="utf-8" We must change float32 and float64 at once because of the DEFINE_S390_DIVIDE_TO_INTEGER macro. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- fpu/softfloat.c | 300 +++++++++++++++++------------------------------- 1 file changed, 107 insertions(+), 193 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index e1b92b38b6..b3208c1891 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1516,11 +1516,11 @@ static bfloat16 bfloat16_round_pack_canonical(Float= Parts64 *p, return bfloat16_pack_raw(p); } =20 -static void float32_unpack_canonical(FloatParts64 *p, float32 f, - float_status *s) +static FloatParts64 float32_unpack_canonical(float32 f, float_status *s) { - *p =3D unpack_raw64(&float32_params, f); - parts64_canonicalize(p, s, &float32_params); + FloatParts64 p =3D unpack_raw64(&float32_params, f); + parts64_canonicalize(&p, s, &float32_params); + return p; } =20 static float32 float32_round_pack_canonical(FloatParts64 *p, @@ -1530,11 +1530,11 @@ static float32 float32_round_pack_canonical(FloatPa= rts64 *p, return float32_pack_raw(p); } =20 -static void float64_unpack_canonical(FloatParts64 *p, float64 f, - float_status *s) +static FloatParts64 float64_unpack_canonical(float64 f, float_status *s) { - *p =3D unpack_raw64(&float64_params, f); - parts64_canonicalize(p, s, &float64_params); + FloatParts64 p =3D unpack_raw64(&float64_params, f); + parts64_canonicalize(&p, s, &float64_params); + return p; } =20 static float64 float64_round_pack_canonical(FloatParts64 *p, @@ -1722,11 +1722,9 @@ float16 float16_sub(float16 a, float16 b, float_stat= us *status) static float32 QEMU_SOFTFLOAT_ATTR soft_f32_addsub(float32 a, float32 b, float_status *status, bool subtract) { - FloatParts64 pa, pb, *pr; - - float32_unpack_canonical(&pa, a, status); - float32_unpack_canonical(&pb, b, status); - pr =3D parts64_addsub(&pa, &pb, status, subtract); + FloatParts64 pa =3D float32_unpack_canonical(a, status); + FloatParts64 pb =3D float32_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_addsub(&pa, &pb, status, subtract); =20 return float32_round_pack_canonical(pr, status); } @@ -1744,11 +1742,9 @@ static float32 soft_f32_sub(float32 a, float32 b, fl= oat_status *status) static float64 QEMU_SOFTFLOAT_ATTR soft_f64_addsub(float64 a, float64 b, float_status *status, bool subtract) { - FloatParts64 pa, pb, *pr; - - float64_unpack_canonical(&pa, a, status); - float64_unpack_canonical(&pb, b, status); - pr =3D parts64_addsub(&pa, &pb, status, subtract); + FloatParts64 pa =3D float64_unpack_canonical(a, status); + FloatParts64 pb =3D float64_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_addsub(&pa, &pb, status, subtract); =20 return float64_round_pack_canonical(pr, status); } @@ -1841,11 +1837,9 @@ float64_sub(float64 a, float64 b, float_status *s) static float64 float64r32_addsub(float64 a, float64 b, float_status *statu= s, bool subtract) { - FloatParts64 pa, pb, *pr; - - float64_unpack_canonical(&pa, a, status); - float64_unpack_canonical(&pb, b, status); - pr =3D parts64_addsub(&pa, &pb, status, subtract); + FloatParts64 pa =3D float64_unpack_canonical(a, status); + FloatParts64 pb =3D float64_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_addsub(&pa, &pb, status, subtract); =20 return float64r32_round_pack_canonical(pr, status); } @@ -1942,11 +1936,9 @@ float16 QEMU_FLATTEN float16_mul(float16 a, float16 = b, float_status *status) static float32 QEMU_SOFTFLOAT_ATTR soft_f32_mul(float32 a, float32 b, float_status *status) { - FloatParts64 pa, pb, *pr; - - float32_unpack_canonical(&pa, a, status); - float32_unpack_canonical(&pb, b, status); - pr =3D parts64_mul(&pa, &pb, status); + FloatParts64 pa =3D float32_unpack_canonical(a, status); + FloatParts64 pb =3D float32_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_mul(&pa, &pb, status); =20 return float32_round_pack_canonical(pr, status); } @@ -1954,11 +1946,9 @@ soft_f32_mul(float32 a, float32 b, float_status *sta= tus) static float64 QEMU_SOFTFLOAT_ATTR soft_f64_mul(float64 a, float64 b, float_status *status) { - FloatParts64 pa, pb, *pr; - - float64_unpack_canonical(&pa, a, status); - float64_unpack_canonical(&pb, b, status); - pr =3D parts64_mul(&pa, &pb, status); + FloatParts64 pa =3D float64_unpack_canonical(a, status); + FloatParts64 pb =3D float64_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_mul(&pa, &pb, status); =20 return float64_round_pack_canonical(pr, status); } @@ -1989,11 +1979,9 @@ float64_mul(float64 a, float64 b, float_status *s) =20 float64 float64r32_mul(float64 a, float64 b, float_status *status) { - FloatParts64 pa, pb, *pr; - - float64_unpack_canonical(&pa, a, status); - float64_unpack_canonical(&pb, b, status); - pr =3D parts64_mul(&pa, &pb, status); + FloatParts64 pa =3D float64_unpack_canonical(a, status); + FloatParts64 pb =3D float64_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_mul(&pa, &pb, status); =20 return float64r32_round_pack_canonical(pr, status); } @@ -2066,12 +2054,10 @@ float32 QEMU_SOFTFLOAT_ATTR float32_muladd_scalbn(float32 a, float32 b, float32 c, int scale, int flags, float_status *status) { - FloatParts64 pa, pb, pc, *pr; - - float32_unpack_canonical(&pa, a, status); - float32_unpack_canonical(&pb, b, status); - float32_unpack_canonical(&pc, c, status); - pr =3D parts64_muladd_scalbn(&pa, &pb, &pc, scale, flags, status); + FloatParts64 pa =3D float32_unpack_canonical(a, status); + FloatParts64 pb =3D float32_unpack_canonical(b, status); + FloatParts64 pc =3D float32_unpack_canonical(c, status); + FloatParts64 *pr =3D parts64_muladd_scalbn(&pa, &pb, &pc, scale, flags= , status); =20 /* Round before applying negate result. */ parts64_uncanon(pr, status, &float32_params, false); @@ -2085,12 +2071,10 @@ float64 QEMU_SOFTFLOAT_ATTR float64_muladd_scalbn(float64 a, float64 b, float64 c, int scale, int flags, float_status *status) { - FloatParts64 pa, pb, pc, *pr; - - float64_unpack_canonical(&pa, a, status); - float64_unpack_canonical(&pb, b, status); - float64_unpack_canonical(&pc, c, status); - pr =3D parts64_muladd_scalbn(&pa, &pb, &pc, scale, flags, status); + FloatParts64 pa =3D float64_unpack_canonical(a, status); + FloatParts64 pb =3D float64_unpack_canonical(b, status); + FloatParts64 pc =3D float64_unpack_canonical(c, status); + FloatParts64 *pr =3D parts64_muladd_scalbn(&pa, &pb, &pc, scale, flags= , status); =20 /* Round before applying negate result. */ parts64_uncanon(pr, status, &float64_params, false); @@ -2244,12 +2228,10 @@ float64_muladd(float64 xa, float64 xb, float64 xc, = int flags, float_status *s) float64 float64r32_muladd(float64 a, float64 b, float64 c, int flags, float_status *status) { - FloatParts64 pa, pb, pc, *pr; - - float64_unpack_canonical(&pa, a, status); - float64_unpack_canonical(&pb, b, status); - float64_unpack_canonical(&pc, c, status); - pr =3D parts64_muladd_scalbn(&pa, &pb, &pc, 0, flags, status); + FloatParts64 pa =3D float64_unpack_canonical(a, status); + FloatParts64 pb =3D float64_unpack_canonical(b, status); + FloatParts64 pc =3D float64_unpack_canonical(c, status); + FloatParts64 *pr =3D parts64_muladd_scalbn(&pa, &pb, &pc, 0, flags, st= atus); =20 /* Round before applying negate result. */ parts64_uncanon(pr, status, &float32_params, false); @@ -2309,11 +2291,9 @@ float16 float16_div(float16 a, float16 b, float_stat= us *status) static float32 QEMU_SOFTFLOAT_ATTR soft_f32_div(float32 a, float32 b, float_status *status) { - FloatParts64 pa, pb, *pr; - - float32_unpack_canonical(&pa, a, status); - float32_unpack_canonical(&pb, b, status); - pr =3D parts64_div(&pa, &pb, status); + FloatParts64 pa =3D float32_unpack_canonical(a, status); + FloatParts64 pb =3D float32_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_div(&pa, &pb, status); =20 return float32_round_pack_canonical(pr, status); } @@ -2321,11 +2301,9 @@ soft_f32_div(float32 a, float32 b, float_status *sta= tus) static float64 QEMU_SOFTFLOAT_ATTR soft_f64_div(float64 a, float64 b, float_status *status) { - FloatParts64 pa, pb, *pr; - - float64_unpack_canonical(&pa, a, status); - float64_unpack_canonical(&pb, b, status); - pr =3D parts64_div(&pa, &pb, status); + FloatParts64 pa =3D float64_unpack_canonical(a, status); + FloatParts64 pb =3D float64_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_div(&pa, &pb, status); =20 return float64_round_pack_canonical(pr, status); } @@ -2390,11 +2368,9 @@ float64_div(float64 a, float64 b, float_status *s) =20 float64 float64r32_div(float64 a, float64 b, float_status *status) { - FloatParts64 pa, pb, *pr; - - float64_unpack_canonical(&pa, a, status); - float64_unpack_canonical(&pb, b, status); - pr =3D parts64_div(&pa, &pb, status); + FloatParts64 pa =3D float64_unpack_canonical(a, status); + FloatParts64 pb =3D float64_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_div(&pa, &pb, status); =20 return float64r32_round_pack_canonical(pr, status); } @@ -2440,22 +2416,18 @@ floatx80 floatx80_div(floatx80 a, floatx80 b, float= _status *status) =20 float32 float32_rem(float32 a, float32 b, float_status *status) { - FloatParts64 pa, pb, *pr; - - float32_unpack_canonical(&pa, a, status); - float32_unpack_canonical(&pb, b, status); - pr =3D parts64_modrem(&pa, &pb, NULL, status); + FloatParts64 pa =3D float32_unpack_canonical(a, status); + FloatParts64 pb =3D float32_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_modrem(&pa, &pb, NULL, status); =20 return float32_round_pack_canonical(pr, status); } =20 float64 float64_rem(float64 a, float64 b, float_status *status) { - FloatParts64 pa, pb, *pr; - - float64_unpack_canonical(&pa, a, status); - float64_unpack_canonical(&pb, b, status); - pr =3D parts64_modrem(&pa, &pb, NULL, status); + FloatParts64 pa =3D float64_unpack_canonical(a, status); + FloatParts64 pb =3D float64_unpack_canonical(b, status); + FloatParts64 *pr =3D parts64_modrem(&pa, &pb, NULL, status); =20 return float64_round_pack_canonical(pr, status); } @@ -2688,28 +2660,25 @@ float64 float16_to_float64(float16 a, bool ieee, fl= oat_status *s) =20 float8_e4m3 float32_to_float8_e4m3(float32 a, bool saturate, float_status = *s) { - FloatParts64 p; + FloatParts64 p =3D float32_unpack_canonical(a, s); =20 - float32_unpack_canonical(&p, a, s); parts64_float_to_float(&p, s); return float8_e4m3_round_pack_canonical(&p, s, saturate); } =20 float8_e5m2 float32_to_float8_e5m2(float32 a, bool saturate, float_status = *s) { - FloatParts64 p; + FloatParts64 p =3D float32_unpack_canonical(a, s); =20 - float32_unpack_canonical(&p, a, s); parts_float_to_e5m2(&p, s, saturate); return float8_e5m2_round_pack_canonical(&p, s, saturate); } =20 float16 float32_to_float16(float32 a, bool ieee, float_status *s) { - FloatParts64 p; + FloatParts64 p =3D float32_unpack_canonical(a, s); const FloatFmt *fmt; =20 - float32_unpack_canonical(&p, a, s); if (ieee) { parts64_float_to_float(&p, s); fmt =3D &float16_params; @@ -2723,9 +2692,8 @@ float16 float32_to_float16(float32 a, bool ieee, floa= t_status *s) static float64 QEMU_SOFTFLOAT_ATTR soft_float32_to_float64(float32 a, float_status *s) { - FloatParts64 p; + FloatParts64 p =3D float32_unpack_canonical(a, s); =20 - float32_unpack_canonical(&p, a, s); parts64_float_to_float(&p, s); return float64_round_pack_canonical(&p, s); } @@ -2748,10 +2716,9 @@ float64 float32_to_float64(float32 a, float_status *= s) =20 float16 float64_to_float16(float64 a, bool ieee, float_status *s) { - FloatParts64 p; + FloatParts64 p =3D float64_unpack_canonical(a, s); const FloatFmt *fmt; =20 - float64_unpack_canonical(&p, a, s); if (ieee) { parts64_float_to_float(&p, s); fmt =3D &float16_params; @@ -2764,9 +2731,8 @@ float16 float64_to_float16(float64 a, bool ieee, floa= t_status *s) =20 float32 float64_to_float32(float64 a, float_status *s) { - FloatParts64 p; + FloatParts64 p =3D float64_unpack_canonical(a, s); =20 - float64_unpack_canonical(&p, a, s); parts64_float_to_float(&p, s); return float32_round_pack_canonical(&p, s); } @@ -2805,18 +2771,16 @@ float64 bfloat16_to_float64(bfloat16 a, float_statu= s *s) =20 bfloat16 float32_to_bfloat16(float32 a, float_status *s) { - FloatParts64 p; + FloatParts64 p =3D float32_unpack_canonical(a, s); =20 - float32_unpack_canonical(&p, a, s); parts64_float_to_float(&p, s); return bfloat16_round_pack_canonical(&p, s); } =20 bfloat16 float64_to_bfloat16(float64 a, float_status *s) { - FloatParts64 p; + FloatParts64 p =3D float64_unpack_canonical(a, s); =20 - float64_unpack_canonical(&p, a, s); parts64_float_to_float(&p, s); return bfloat16_round_pack_canonical(&p, s); } @@ -2843,20 +2807,18 @@ float64 float128_to_float64(float128 a, float_statu= s *s) =20 float128 float32_to_float128(float32 a, float_status *s) { - FloatParts64 p64; + FloatParts64 p64 =3D float32_unpack_canonical(a, s); FloatParts128 p128; =20 - float32_unpack_canonical(&p64, a, s); parts_float_to_float_widen(&p128, &p64, s); return float128_round_pack_canonical(&p128, s); } =20 float128 float64_to_float128(float64 a, float_status *s) { - FloatParts64 p64; + FloatParts64 p64 =3D float64_unpack_canonical(a, s); FloatParts128 p128; =20 - float64_unpack_canonical(&p64, a, s); parts_float_to_float_widen(&p128, &p64, s); return float128_round_pack_canonical(&p128, s); } @@ -2901,20 +2863,18 @@ float128 floatx80_to_float128(floatx80 a, float_sta= tus *s) =20 floatx80 float32_to_floatx80(float32 a, float_status *s) { - FloatParts64 p64; + FloatParts64 p64 =3D float32_unpack_canonical(a, s); FloatParts128 p128; =20 - float32_unpack_canonical(&p64, a, s); parts_float_to_float_widen(&p128, &p64, s); return floatx80_round_pack_canonical(&p128, s); } =20 floatx80 float64_to_floatx80(float64 a, float_status *s) { - FloatParts64 p64; + FloatParts64 p64 =3D float64_unpack_canonical(a, s); FloatParts128 p128; =20 - float64_unpack_canonical(&p64, a, s); parts_float_to_float_widen(&p128, &p64, s); return floatx80_round_pack_canonical(&p128, s); } @@ -2942,18 +2902,16 @@ float16 float16_round_to_int(float16 a, float_statu= s *s) =20 float32 float32_round_to_int(float32 a, float_status *s) { - FloatParts64 p; + FloatParts64 p =3D float32_unpack_canonical(a, s); =20 - float32_unpack_canonical(&p, a, s); parts64_round_to_int(&p, s->float_rounding_mode, 0, s, &float32_params= ); return float32_round_pack_canonical(&p, s); } =20 float64 float64_round_to_int(float64 a, float_status *s) { - FloatParts64 p; + FloatParts64 p =3D float64_unpack_canonical(a, s); =20 - float64_unpack_canonical(&p, a, s); parts64_round_to_int(&p, s->float_rounding_mode, 0, s, &float64_params= ); return float64_round_pack_canonical(&p, s); } @@ -3023,54 +2981,42 @@ int64_t float16_to_int64_scalbn(float16 a, FloatRou= ndMode rmode, int scale, int16_t float32_to_int16_scalbn(float32 a, FloatRoundMode rmode, int scale, float_status *s) { - FloatParts64 p; - - float32_unpack_canonical(&p, a, s); + FloatParts64 p =3D float32_unpack_canonical(a, s); return parts64_float_to_sint(&p, rmode, scale, INT16_MIN, INT16_MAX, s= ); } =20 int32_t float32_to_int32_scalbn(float32 a, FloatRoundMode rmode, int scale, float_status *s) { - FloatParts64 p; - - float32_unpack_canonical(&p, a, s); + FloatParts64 p =3D float32_unpack_canonical(a, s); return parts64_float_to_sint(&p, rmode, scale, INT32_MIN, INT32_MAX, s= ); } =20 int64_t float32_to_int64_scalbn(float32 a, FloatRoundMode rmode, int scale, float_status *s) { - FloatParts64 p; - - float32_unpack_canonical(&p, a, s); + FloatParts64 p =3D float32_unpack_canonical(a, s); return parts64_float_to_sint(&p, rmode, scale, INT64_MIN, INT64_MAX, s= ); } =20 int16_t float64_to_int16_scalbn(float64 a, FloatRoundMode rmode, int scale, float_status *s) { - FloatParts64 p; - - float64_unpack_canonical(&p, a, s); + FloatParts64 p =3D float64_unpack_canonical(a, s); return parts64_float_to_sint(&p, rmode, scale, INT16_MIN, INT16_MAX, s= ); } =20 int32_t float64_to_int32_scalbn(float64 a, FloatRoundMode rmode, int scale, float_status *s) { - FloatParts64 p; - - float64_unpack_canonical(&p, a, s); + FloatParts64 p =3D float64_unpack_canonical(a, s); return parts64_float_to_sint(&p, rmode, scale, INT32_MIN, INT32_MAX, s= ); } =20 int64_t float64_to_int64_scalbn(float64 a, FloatRoundMode rmode, int scale, float_status *s) { - FloatParts64 p; - - float64_unpack_canonical(&p, a, s); + FloatParts64 p =3D float64_unpack_canonical(a, s); return parts64_float_to_sint(&p, rmode, scale, INT64_MIN, INT64_MAX, s= ); } =20 @@ -3455,18 +3401,14 @@ static int64_t parts64_float_to_sint_modulo(FloatPa= rts64 *p, int32_t float64_to_int32_modulo(float64 a, FloatRoundMode rmode, float_status *s) { - FloatParts64 p; - - float64_unpack_canonical(&p, a, s); + FloatParts64 p =3D float64_unpack_canonical(a, s); return parts64_float_to_sint_modulo(&p, rmode, 31, s); } =20 int64_t float64_to_int64_modulo(float64 a, FloatRoundMode rmode, float_status *s) { - FloatParts64 p; - - float64_unpack_canonical(&p, a, s); + FloatParts64 p =3D float64_unpack_canonical(a, s); return parts64_float_to_sint_modulo(&p, rmode, 63, s); } =20 @@ -3505,54 +3447,42 @@ uint64_t float16_to_uint64_scalbn(float16 a, FloatR= oundMode rmode, int scale, uint16_t float32_to_uint16_scalbn(float32 a, FloatRoundMode rmode, int sca= le, float_status *s) { - FloatParts64 p; - - float32_unpack_canonical(&p, a, s); + FloatParts64 p =3D float32_unpack_canonical(a, s); return parts64_float_to_uint(&p, rmode, scale, UINT16_MAX, s); } =20 uint32_t float32_to_uint32_scalbn(float32 a, FloatRoundMode rmode, int sca= le, float_status *s) { - FloatParts64 p; - - float32_unpack_canonical(&p, a, s); + FloatParts64 p =3D float32_unpack_canonical(a, s); return parts64_float_to_uint(&p, rmode, scale, UINT32_MAX, s); } =20 uint64_t float32_to_uint64_scalbn(float32 a, FloatRoundMode rmode, int sca= le, float_status *s) { - FloatParts64 p; - - float32_unpack_canonical(&p, a, s); + FloatParts64 p =3D float32_unpack_canonical(a, s); return parts64_float_to_uint(&p, rmode, scale, UINT64_MAX, s); } =20 uint16_t float64_to_uint16_scalbn(float64 a, FloatRoundMode rmode, int sca= le, float_status *s) { - FloatParts64 p; - - float64_unpack_canonical(&p, a, s); + FloatParts64 p =3D float64_unpack_canonical(a, s); return parts64_float_to_uint(&p, rmode, scale, UINT16_MAX, s); } =20 uint32_t float64_to_uint32_scalbn(float64 a, FloatRoundMode rmode, int sca= le, float_status *s) { - FloatParts64 p; - - float64_unpack_canonical(&p, a, s); + FloatParts64 p =3D float64_unpack_canonical(a, s); return parts64_float_to_uint(&p, rmode, scale, UINT32_MAX, s); } =20 uint64_t float64_to_uint64_scalbn(float64 a, FloatRoundMode rmode, int sca= le, float_status *s) { - FloatParts64 p; - - float64_unpack_canonical(&p, a, s); + FloatParts64 p =3D float64_unpack_canonical(a, s); return parts64_float_to_uint(&p, rmode, scale, UINT64_MAX, s); } =20 @@ -4266,22 +4196,18 @@ static bfloat16 bfloat16_minmax(bfloat16 a, bfloat1= 6 b, =20 static float32 float32_minmax(float32 a, float32 b, float_status *s, int f= lags) { - FloatParts64 pa, pb, *pr; - - float32_unpack_canonical(&pa, a, s); - float32_unpack_canonical(&pb, b, s); - pr =3D parts64_minmax(&pa, &pb, s, flags); + FloatParts64 pa =3D float32_unpack_canonical(a, s); + FloatParts64 pb =3D float32_unpack_canonical(b, s); + FloatParts64 *pr =3D parts64_minmax(&pa, &pb, s, flags); =20 return float32_round_pack_canonical(pr, s); } =20 static float64 float64_minmax(float64 a, float64 b, float_status *s, int f= lags) { - FloatParts64 pa, pb, *pr; - - float64_unpack_canonical(&pa, a, s); - float64_unpack_canonical(&pb, b, s); - pr =3D parts64_minmax(&pa, &pb, s, flags); + FloatParts64 pa =3D float64_unpack_canonical(a, s); + FloatParts64 pb =3D float64_unpack_canonical(b, s); + FloatParts64 *pr =3D parts64_minmax(&pa, &pb, s, flags); =20 return float64_round_pack_canonical(pr, s); } @@ -4347,10 +4273,9 @@ FloatRelation float16_compare_quiet(float16 a, float= 16 b, float_status *s) static FloatRelation QEMU_SOFTFLOAT_ATTR float32_do_compare(float32 a, float32 b, float_status *s, bool is_quiet) { - FloatParts64 pa, pb; + FloatParts64 pa =3D float32_unpack_canonical(a, s); + FloatParts64 pb =3D float32_unpack_canonical(b, s); =20 - float32_unpack_canonical(&pa, a, s); - float32_unpack_canonical(&pb, b, s); return parts64_compare(&pa, &pb, s, is_quiet); } =20 @@ -4401,10 +4326,9 @@ FloatRelation float32_compare_quiet(float32 a, float= 32 b, float_status *s) static FloatRelation QEMU_SOFTFLOAT_ATTR float64_do_compare(float64 a, float64 b, float_status *s, bool is_quiet) { - FloatParts64 pa, pb; + FloatParts64 pa =3D float64_unpack_canonical(a, s); + FloatParts64 pb =3D float64_unpack_canonical(b, s); =20 - float64_unpack_canonical(&pa, a, s); - float64_unpack_canonical(&pb, b, s); return parts64_compare(&pa, &pb, s, is_quiet); } =20 @@ -4527,18 +4451,16 @@ float16 float16_scalbn(float16 a, int n, float_stat= us *status) =20 float32 float32_scalbn(float32 a, int n, float_status *status) { - FloatParts64 p; + FloatParts64 p =3D float32_unpack_canonical(a, status); =20 - float32_unpack_canonical(&p, a, status); parts64_scalbn(&p, n, status); return float32_round_pack_canonical(&p, status); } =20 float64 float64_scalbn(float64 a, int n, float_status *status) { - FloatParts64 p; + FloatParts64 p =3D float64_unpack_canonical(a, status); =20 - float64_unpack_canonical(&p, a, status); parts64_scalbn(&p, n, status); return float64_round_pack_canonical(&p, status); } @@ -4586,9 +4508,8 @@ float16 QEMU_FLATTEN float16_sqrt(float16 a, float_st= atus *status) static float32 QEMU_SOFTFLOAT_ATTR soft_f32_sqrt(float32 a, float_status *status) { - FloatParts64 p; + FloatParts64 p =3D float32_unpack_canonical(a, status); =20 - float32_unpack_canonical(&p, a, status); parts64_sqrt(&p, status, &float32_params); return float32_round_pack_canonical(&p, status); } @@ -4596,9 +4517,8 @@ soft_f32_sqrt(float32 a, float_status *status) static float64 QEMU_SOFTFLOAT_ATTR soft_f64_sqrt(float64 a, float_status *status) { - FloatParts64 p; + FloatParts64 p =3D float64_unpack_canonical(a, status); =20 - float64_unpack_canonical(&p, a, status); parts64_sqrt(&p, status, &float64_params); return float64_round_pack_canonical(&p, status); } @@ -4659,9 +4579,8 @@ float64 QEMU_FLATTEN float64_sqrt(float64 xa, float_s= tatus *s) =20 float64 float64r32_sqrt(float64 a, float_status *status) { - FloatParts64 p; + FloatParts64 p =3D float64_unpack_canonical(a, status); =20 - float64_unpack_canonical(&p, a, status); parts64_sqrt(&p, status, &float64_params); return float64r32_round_pack_canonical(&p, status); } @@ -4822,18 +4741,16 @@ static void parts64_log2(FloatParts64 *a, float_sta= tus *s, const FloatFmt *fmt) =20 float32 float32_log2(float32 a, float_status *status) { - FloatParts64 p; + FloatParts64 p =3D float32_unpack_canonical(a, status); =20 - float32_unpack_canonical(&p, a, status); parts64_log2(&p, status, &float32_params); return float32_round_pack_canonical(&p, status); } =20 float64 float64_log2(float64 a, float_status *status) { - FloatParts64 p; + FloatParts64 p =3D float64_unpack_canonical(a, status); =20 - float64_unpack_canonical(&p, a, status); parts64_log2(&p, status, &float64_params); return float64_round_pack_canonical(&p, status); } @@ -5321,10 +5238,9 @@ static const float64 float32_exp2_coefficients[15] = =3D =20 float32 float32_exp2(float32 a, float_status *status) { - FloatParts64 xp, xnp, tp, rp; - int i; + FloatParts64 xnp, tp, rp; + FloatParts64 xp =3D float32_unpack_canonical(a, status); =20 - float32_unpack_canonical(&xp, a, status); if (unlikely(xp.cls !=3D float_class_normal)) { switch (xp.cls) { case float_class_denormal: @@ -5344,14 +5260,13 @@ float32 float32_exp2(float32 a, float_status *statu= s) =20 float_raise(float_flag_inexact, status); =20 - float64_unpack_canonical(&tp, float64_ln2, status); + tp =3D float64_unpack_canonical(float64_ln2, status); xp =3D *parts64_mul(&xp, &tp, status); xnp =3D xp; =20 - float64_unpack_canonical(&rp, float64_one, status); - for (i =3D 0 ; i < 15 ; i++) { - - float64_unpack_canonical(&tp, float32_exp2_coefficients[i], status= ); + rp =3D float64_unpack_canonical(float64_one, status); + for (int i =3D 0; i < 15; i++) { + tp =3D float64_unpack_canonical(float32_exp2_coefficients[i], stat= us); rp =3D *parts64_muladd_scalbn(&tp, &xnp, &rp, 0, 0, status); xnp =3D *parts64_mul(&xnp, &xp, status); } @@ -5504,10 +5419,9 @@ void floatN ## _s390_divide_to_integer(floatN a, flo= atN b, \ uint32_t *cc, int *dxc, = \ float_status *status) = \ { = \ - FloatParts64 pa, pb, pr, pn; = \ - = \ - floatN ## _unpack_canonical(&pa, a, status); = \ - floatN ## _unpack_canonical(&pb, b, status); = \ + FloatParts64 pa =3D floatN ## _unpack_canonical(a, status); = \ + FloatParts64 pb =3D floatN ## _unpack_canonical(b, status); = \ + FloatParts64 pr, pn; = \ parts_s390_divide_to_integer(&pa, &pb, final_quotient_rounding_mode, = \ mask_underflow, mask_inexact, = \ &floatN ## _params, = \ --=20 2.43.0