From patchwork Mon Dec 2 13:13:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 846620 Delivered-To: patch@linaro.org Received: by 2002:a5d:4cd0:0:b0:385:e875:8a9e with SMTP id c16csp1206888wrt; Mon, 2 Dec 2024 05:31:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWvJQAY9c/weSeB/5Yn0yyT3xLnC5bdV3H1p8Z2dy2TWZUtBSR4oECanOzf4m5NremRiSyT6w==@linaro.org X-Google-Smtp-Source: AGHT+IFDmuvAstvssoy+D+uC17EbT5pIXUPTZyMvC9wA4Hr15zgtVoMNQknUH2yi2cC33nHwWXfJ X-Received: by 2002:a05:6000:156c:b0:382:22f4:7773 with SMTP id ffacd0b85a97d-385c6baa5e6mr19158669f8f.0.1733146261377; Mon, 02 Dec 2024 05:31:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733146261; cv=none; d=google.com; s=arc-20240605; b=OvNtxiwgatGEkSqLdPv2mrAFUyyueL3tAW+XxisoUzq5nHZRxsUdL4iS6ic4lbn+tC gI3lqHbxdV0hkynIbnoVyhDjmIgwkmcqC1945GUjkQbHMHqqzqkSwIUigq/aFoh56LuK l279XU8ZIVuSaQl1XAbGViPNZiPKgpQxDpAZ/Qt3FzMymWPq8jkxz80H1e1gJNokd8Fq MSvWOkJLf4QaNDlruGI2UJaS/vmfFBURDZQWNt/dbV9fWKyFGWJGnEp1znQ65kk29TW4 hQCTFHPgdFDeBpxzZJ5q4cVcH4tIs4mtBCBo3WQh8cqzNkImjKjF0odB0EdudchB0tV7 5zhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RVdc4tZyi1UviPeSEA9C0j58Iz1J5UUJq0KN40I4wsc=; fh=QgE9QYJDVj//6C0QJWGeEM+qaFVaxwMel1ZWqkEy6K0=; b=A91P7AuRvloUWQXhVHS2YmAgLlcGxqXelI4OAnFXs5rUeH4xB0h8zvtPL8x79j1XmU 6KZD7evzS5ccJdLya0hYw5g01PCnNtjoNyJ7kh8c6gxR/JdltcTvuBJT5cNTf/0c81XL gyph6qKpBDyJigvZhuUV66gvKUVlpvTqr07BRtoJdXDhVeEFDGqhDvIVBKml+sc1SqKc DmJiz7QTMOB0+4iJGkrD9wSy9d1TBqdfR54tAvNcOw6kgG7gg4sYESuHUgS+2RPGyfiR Wc8dJFH3EhZ8Nvm8gcKCUwA4zTxUfmYh0KL2OiHkchjh+x4bGz98y9PYGtno15k02/WU w+Aw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yzxLQQFh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-385dd2590fasi4636344f8f.134.2024.12.02.05.31.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Dec 2024 05:31:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yzxLQQFh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tI6UL-0000BJ-7l; Mon, 02 Dec 2024 08:29:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tI6Go-0002gS-Cd for qemu-devel@nongnu.org; Mon, 02 Dec 2024 08:15:27 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tI6GX-0003HE-Tl for qemu-devel@nongnu.org; Mon, 02 Dec 2024 08:15:20 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-385e96a285eso879507f8f.3 for ; Mon, 02 Dec 2024 05:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733145266; x=1733750066; 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=RVdc4tZyi1UviPeSEA9C0j58Iz1J5UUJq0KN40I4wsc=; b=yzxLQQFh5ZAoRMP+QJ1WOdNdShuHCb63ny70ztlOgIjkhnHbpt47gTWKmDHWFPP54w rYwDp9wBFzmhg2X8aWu5t/jJ1Q4TjGHiA+cLha7itEs2NqY/7BmUKsjqRXQ5dJlCDF4a ZYFDKm61j4hDotovagmPQ9PwUNoJE1Nsm5m8QzDzw6bAG5ONtUfIH96Nxthj1Cr/Ojyj 3N7kjGZvOnuc6ARRCUzUis2xpH6H9rN4pctboLCM+kGgARwoGdACUhToegNo/Mh8s2cl ViOy2sg95X/8nRsWWbr17iKfhpT2BUTUKWwGXwE4t0ECJDxLk0w68lg7f5WnM/qOSHVI /sHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733145266; x=1733750066; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RVdc4tZyi1UviPeSEA9C0j58Iz1J5UUJq0KN40I4wsc=; b=R3H/YO7i6+sZA922g7fDuWHc7UWIYNVZNKDNeeD1hdcsl9jjZKkFu67rh8rw64nl6a tz3i0+YKEbVYIwOSegIS7X4mNix1fIzN7wO7hAfBxJDe1vDsjcidcz7NrRtTBUImh1Xp NYtSM3vpdzF91dYYb72KeZ9t6BApFtcKiNZy3kfYZepXKhkRRaa/5tWET/h/jQeqZFHp Cn6azXMFP48aQP+U/L04m347qCMjwifC5oEIwIdgkTk0u0/ES+USnxemaEPhcENMSYqt D58aNhHTMrIxTjK/yRWomgs769FrYU5OGEtt5epBSMHAF4OT/icasU1u+9vGkvIRqeId IVww== X-Gm-Message-State: AOJu0YzED4BdwYRJKUrCVBXjvus+uVJP/5PEsq1clwfEKXuTxODvlAm8 4OkbfoEbtye/1oXBRdtot9nT3f7YXeU8z6ByyCgs6cMkYvgJ0iq6feG+KT+YCiC8/ySPNrLbAkw / X-Gm-Gg: ASbGncusMfjX8bgWtBEtZKxEHbyg5ifDrrmzUw0MrPfiTqVEb64Aw1a0ZzrNu4L1yjW qpRUX9TE27GjhjbQ6lP/+ScbwjSJ7BC8WAh3PeDr2Mtcw8bjCxeS3bdGqYTqM3sBt/C+syfI9bU TVf1wXnJHK9Rgwzbt/e+RLB9bz8cJi8LZgeRKXklPsrlHI1qIeynQ/dHmwLtOnFrLTWbmQ+zZ2A Pl/wRuWAHxnQTPT7nIn3BiI7SjrDnJMwqVKMLA2/5k2+sSqT/mrxK4= X-Received: by 2002:a05:6000:1566:b0:382:4f70:10cf with SMTP id ffacd0b85a97d-385c6ebba5cmr20127579f8f.20.1733145265729; Mon, 02 Dec 2024 05:14:25 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-385dea1e4ebsm10160157f8f.1.2024.12.02.05.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2024 05:14:25 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Eduardo Habkost , Song Gao , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Rikalo , Nicholas Piggin , Daniel Henrique Barboza , David Hildenbrand , Ilya Leoshkevich , Thomas Huth , Mark Cave-Ayland , Artyom Tarasenko , Max Filippov Subject: [PATCH v2 for-10.0 20/54] target/s390x: Set Float3NaNPropRule explicitly Date: Mon, 2 Dec 2024 13:13:13 +0000 Message-Id: <20241202131347.498124-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241202131347.498124-1-peter.maydell@linaro.org> References: <20241202131347.498124-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Set the Float3NaNPropRule explicitly for s390x, and remove the ifdef from pickNaNMulAdd(). Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/s390x/cpu.c | 1 + fpu/softfloat-specialize.c.inc | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index d5941b5b9df..e74055bad79 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -206,6 +206,7 @@ static void s390_cpu_reset_hold(Object *obj, ResetType type) set_float_detect_tininess(float_tininess_before_rounding, &env->fpu_status); set_float_2nan_prop_rule(float_2nan_prop_s_ab, &env->fpu_status); + set_float_3nan_prop_rule(float_3nan_prop_s_abc, &env->fpu_status); set_float_infzeronan_rule(float_infzeronan_dnan_always, &env->fpu_status); /* fall through */ diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc index 173b9eadb57..8a36280df1a 100644 --- a/fpu/softfloat-specialize.c.inc +++ b/fpu/softfloat-specialize.c.inc @@ -511,8 +511,6 @@ static int pickNaNMulAdd(FloatClass a_cls, FloatClass b_cls, FloatClass c_cls, } else { rule = float_3nan_prop_s_cab; } -#elif defined(TARGET_S390X) - rule = float_3nan_prop_s_abc; #elif defined(TARGET_SPARC) rule = float_3nan_prop_s_cba; #elif defined(TARGET_XTENSA)