From patchwork Mon May 14 22:12:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135783 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp201517lji; Mon, 14 May 2018 15:32:29 -0700 (PDT) X-Google-Smtp-Source: AB8JxZosVXtMrhasBHaDPEP91Z4nT4QkqYjcvGPNCnccxUqbJjiCVKvGXXfArE/XNxToz9i9SeeW X-Received: by 2002:a37:5ac5:: with SMTP id o188-v6mr9879444qkb.295.1526337149490; Mon, 14 May 2018 15:32:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526337149; cv=none; d=google.com; s=arc-20160816; b=yn/dLZ+5HTiSqfsKhSmSGIR/jJ1rzg8KFtF4SWhxcGatOjVyfhG7AWb5D/xnhyze3F 34f5XUBCeEAWHe+1sNm2TlpSSCXqT/edC5ujtpzl8LBTo6STjAjsQ7cRwLIV/mrqo8/n s3+/BRaWsATjVEf7VewYRpHeWbSWc5eyqabZMo+dA8xs+Q1BRJZQSKCqO70Qhje2M/6J Q68XsyBjCjbUEvEWEG2A1+S4Ofduc3geHPwqv25igQIAr4uiCJ9E5jgeblz2VOO5NJgU kRT9EPwvB+6CN//rg/RGEadkmSXeSvqH1GCBYw3oqmsKl6qxC3hWS0SUU2tnjCWtkMV2 8jQQ== 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=9z4EoWnekLIhRQCMjbOL53uOBSiOY08v6fsPvwdooRE=; b=ue6RFOGiNOBFf+IrEOcTxtJdFWUQO2o/umNe43I0yMxbFRCiBMwAzknab3ABYlcMzW dQ5jIlFuXULS40HCwHwKM8pazEagTLDeWNUBy8OAGN9EGennhLQisT9MZ1PNSVFCCTGM T4zKe1BwxOFhfj82CC7gDnAvd+RSb6Y/HwQsoqsZ37DLVHTJShVPyWT6TAmBk6ftrCRr swvvXQfZxSYkt42PBpvm0s5TVKAja+ryoW3zhMKG5wPjW3QV/YGkQKage5jylao2hJ0D uyE5d7Us3sYUsdDh1kdlOtur4bBTf+R6QQFI3rYJWSpAgJJHgqxFC1O60DmtMjnblQZh afpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fzmOaYfY; 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 m14-v6si9582758qvo.99.2018.05.14.15.32.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 14 May 2018 15:32: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=fzmOaYfY; 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]:50293 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIM16-0008KW-UF for patch@linaro.org; Mon, 14 May 2018 18:32:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fILi7-0008BF-Qe for qemu-devel@nongnu.org; Mon, 14 May 2018 18:12:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fILi6-0008D8-KQ for qemu-devel@nongnu.org; Mon, 14 May 2018 18:12:51 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:43161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fILi6-0008BM-Eh for qemu-devel@nongnu.org; Mon, 14 May 2018 18:12:50 -0400 Received: by mail-pg0-x241.google.com with SMTP id p8-v6so2538834pgq.10 for ; Mon, 14 May 2018 15:12:50 -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=9z4EoWnekLIhRQCMjbOL53uOBSiOY08v6fsPvwdooRE=; b=fzmOaYfYonw1peGW5pSYesgsFxtBsoZdXwSn822MpCE/0s8zd/8iCa6VTrLver0M1a z0WceH7ScOg+XeBRe3mgUhYi3oE8r4ElsK+Vz7wozfB9ZHCxMmCgmt8uxP0trUL7UZ80 tATrtFY3tNohwp+N4wHkkY/Xaimw8jEr/YUnI= 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=9z4EoWnekLIhRQCMjbOL53uOBSiOY08v6fsPvwdooRE=; b=rfnqBZXNdghenVWslyRO6dL1BDsUE7XYk2NijG3JtFQTMNdca4tman3zNq39e8mIr5 KMzTyLIX12w9yHy2P8y/ItlVvBJeOeUXEyrI4s+6C1Aup+w13t78Scmsl8d5QlD76Mav vp4DN9DJ6Tm97M5tvLs7DLcR7b//mvdP1SypTVztB/XVYAkPCGxkncx7Ieo7yiXu4gSi R0KHnU6038KPC4Cih8X0py4cl4p82VWkzRDlUhllciuQ7L1B5KlkZM6KfQbk3fmMy6HT 1gFFKslaxS28b4/CJ+zF6maJWVlFlZ4H7IDl8rdpMFhl3UfAMHTSYRSiFT/+kIrxTSvY 9ucA== X-Gm-Message-State: ALKqPweTM+WRRZO9vPvxjFUP9MACY0xH6xvXBCVKGLZLPhbkGL7eHXT+ kuNl5RCJpb6i+gNYbEsr/kAACm/flJk= X-Received: by 2002:a63:a312:: with SMTP id s18-v6mr9680477pge.187.1526335969247; Mon, 14 May 2018 15:12:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 May 2018 15:12:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 15:12:11 -0700 Message-Id: <20180514221219.7091-21-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:c05::241 Subject: [Qemu-devel] [PATCH v5 20/28] fpu/softfloat: Use float*_silence_nan in propagateFloat*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" We have already checked the arguments for SNaN; we don't need to do it again. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- fpu/softfloat-specialize.h | 44 +++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 10 deletions(-) -- 2.17.0 Reviewed-by: Alex Bennée diff --git a/fpu/softfloat-specialize.h b/fpu/softfloat-specialize.h index 995a0132c6..4fa068a5dc 100644 --- a/fpu/softfloat-specialize.h +++ b/fpu/softfloat-specialize.h @@ -498,7 +498,7 @@ static float32 commonNaNToFloat32(commonNaNT a, float_status *status) | The routine is passed various bits of information about the | two NaNs and should return 0 to select NaN a and 1 for NaN b. | Note that signalling NaNs are always squashed to quiet NaNs -| by the caller, by calling floatXX_maybe_silence_nan() before +| by the caller, by calling floatXX_silence_nan() before | returning them. | | aIsLargerSignificand is only valid if both a and b are NaNs @@ -536,7 +536,7 @@ static int pickNaN(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, { /* According to MIPS specifications, if one of the two operands is * a sNaN, a new qNaN has to be generated. This is done in - * floatXX_maybe_silence_nan(). For qNaN inputs the specifications + * floatXX_silence_nan(). For qNaN inputs the specifications * says: "When possible, this QNaN result is one of the operand QNaN * values." In practice it seems that most implementations choose * the first operand if both operands are qNaN. In short this gives @@ -788,9 +788,15 @@ static float32 propagateFloat32NaN(float32 a, float32 b, float_status *status) if (pickNaN(aIsQuietNaN, aIsSignalingNaN, bIsQuietNaN, bIsSignalingNaN, aIsLargerSignificand)) { - return float32_maybe_silence_nan(b, status); + if (bIsSignalingNaN) { + return float32_silence_nan(b, status); + } + return b; } else { - return float32_maybe_silence_nan(a, status); + if (aIsSignalingNaN) { + return float32_silence_nan(a, status); + } + return a; } } @@ -950,9 +956,15 @@ static float64 propagateFloat64NaN(float64 a, float64 b, float_status *status) if (pickNaN(aIsQuietNaN, aIsSignalingNaN, bIsQuietNaN, bIsSignalingNaN, aIsLargerSignificand)) { - return float64_maybe_silence_nan(b, status); + if (bIsSignalingNaN) { + return float64_silence_nan(b, status); + } + return b; } else { - return float64_maybe_silence_nan(a, status); + if (aIsSignalingNaN) { + return float64_silence_nan(a, status); + } + return a; } } @@ -1121,9 +1133,15 @@ floatx80 propagateFloatx80NaN(floatx80 a, floatx80 b, float_status *status) if (pickNaN(aIsQuietNaN, aIsSignalingNaN, bIsQuietNaN, bIsSignalingNaN, aIsLargerSignificand)) { - return floatx80_maybe_silence_nan(b, status); + if (bIsSignalingNaN) { + return floatx80_silence_nan(b, status); + } + return b; } else { - return floatx80_maybe_silence_nan(a, status); + if (aIsSignalingNaN) { + return floatx80_silence_nan(a, status); + } + return a; } } @@ -1270,8 +1288,14 @@ static float128 propagateFloat128NaN(float128 a, float128 b, if (pickNaN(aIsQuietNaN, aIsSignalingNaN, bIsQuietNaN, bIsSignalingNaN, aIsLargerSignificand)) { - return float128_maybe_silence_nan(b, status); + if (bIsSignalingNaN) { + return float128_silence_nan(b, status); + } + return b; } else { - return float128_maybe_silence_nan(a, status); + if (aIsSignalingNaN) { + return float128_silence_nan(a, status); + } + return a; } }