From patchwork Fri May 11 00:43:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135455 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp249984lji; Thu, 10 May 2018 17:53:37 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpWYl8h7kA/fDJ78uD1tfTxStXNKHjHDCD0qgbWzLx+CPcmSKrSWnCqVf79GsFU/8By8MnO X-Received: by 2002:ac8:161b:: with SMTP id p27-v6mr3508940qtj.135.1526000016971; Thu, 10 May 2018 17:53:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526000016; cv=none; d=google.com; s=arc-20160816; b=fwhCaciUeUSB6GUIpqFIddnR8GsxkSVNxBYkVukIGxDTnZnHYstA40kkimTm4H6XRU 8OaXwxNpGUUebfphm6K4u1go6KHdYJHoYS79nJYkYzETS7Tyc86JMtfEks2mF+FU6Bt4 Vzuu5mPTvazYQ143AJ+SKCO9m9EJrjGl0gmoMWAcZW5AGE/yNK9LzIrXZVBA8snitbrs wWjrOG3uKk8tdxW+aFNdV90VplbW26xFv3V9AFzCRzKjqJ7dbRG6lAfIWFMObUAy1caM FBGYPVAR5bj/9a5wllZQk1WXgulGN6E9sennmkYxiG5MALSjdcP2s5Pl3sBrM8Y9+Gwu Rkqg== 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=x/uKj0FP6HB3vjVYqoW6L0olniJiV++HivclAh/y0nI=; b=UN1ZStm/oD6PgduxSh8aRiq2wLcH3kNxYXPv+uctPU1gIHhDnIcgReECsKQBEuCG8A jLStTQHN6+5aevlZV/zu14gfM4r3md6jbZtcOUwtbtznSyJLMnWBM0odWhXdc1ikjd6v b0OEHQwjrsx/QrSOGl3N4B1vKLWsyILZKln4jgc8rdLzixPKp5p1zRhTPREqckVfTRFN 502JlwgYwc5bKLflISMXRxtMZUVqBjjTXdEg1F8SQZlmi58ycLjY5Ej4f07wY+/vquOe qKazWh/DsUxF74XT1g+9z/ahfoKLESWq9MN2ybwivMYXbTF4ccX4GB1j4gPLx8kjKaxM mMhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gGl1eLVT; 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 p27-v6si371008qtl.92.2018.05.10.17.53.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 10 May 2018 17:53:36 -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=gGl1eLVT; 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]:36202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGwJU-0001AQ-Cu for patch@linaro.org; Thu, 10 May 2018 20:53:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGwAE-0007DG-NB for qemu-devel@nongnu.org; Thu, 10 May 2018 20:44:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGwAD-0004rA-U1 for qemu-devel@nongnu.org; Thu, 10 May 2018 20:44:02 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:33345) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGwAD-0004r0-PK for qemu-devel@nongnu.org; Thu, 10 May 2018 20:44:01 -0400 Received: by mail-pl0-x242.google.com with SMTP id n10-v6so2265206plp.0 for ; Thu, 10 May 2018 17:44:01 -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=x/uKj0FP6HB3vjVYqoW6L0olniJiV++HivclAh/y0nI=; b=gGl1eLVTeNdnWUpayt4zMXD2ATV9FPA4xBvUMO3g/MkvsYKJxWgdajkQZugKHiaMip RDsJozYh1yXaocOFxxQWnyXQReKKs03HJbMTSmB4IApfZpHBKdUdBv4I8wlN6/9CZMcJ ErBmlXF2nl8PqMu6J74lyZwIoGwmdb7P65dS4= 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=x/uKj0FP6HB3vjVYqoW6L0olniJiV++HivclAh/y0nI=; b=pp9H2VJY1RWWomTlT6RoE0YYY8CEXQJ3+isuaY7slQPoM56WHsSWtMGO/4tS3kvyJh S5s4ttm7kTbKq/EWSLFoAoJabV9cHfb3zEdQmQyduJQQ3gWW+t1MZgxeg655/YgQBSgz iYf6YVaN4BvrMLHPsFxXNt7NXzblbVxOMZCVKu4TU2PJHogYvx05yJhYWTZ3ge7J1i+d 4F60WDTkTU6Yg28huvUHQXzKeQnVLbqERDgrb8DapsThKsag9gWFjdNJdxUqwyouxOJ2 9Om4Ki9vXbVEvGe8FrxCvFLIksSekzPNqDJmclELdNhfhkH4At/ewBoKeq/cjf8UnIAB GMcQ== X-Gm-Message-State: ALKqPwecUiW675JeDYixCteW+Ti45DFUKzE+ZmnkNU5aB9BivMSMrQDr cbsV+tAmFrCRXqb1NR/ApTaIx5hUFbQ= X-Received: by 2002:a17:902:5481:: with SMTP id e1-v6mr3266094pli.137.1525999440481; Thu, 10 May 2018 17:44:00 -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 y24-v6sm4216728pfn.23.2018.05.10.17.43.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 May 2018 17:43:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 10 May 2018 17:43:35 -0700 Message-Id: <20180511004345.26708-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511004345.26708-1-richard.henderson@linaro.org> References: <20180511004345.26708-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:c01::242 Subject: [Qemu-devel] [PATCH 09/19] target/arm: Remove floatX_maybe_silence_nan from conversions 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" This is now handled properly by the generic softfloat code. Signed-off-by: Richard Henderson --- target/arm/helper-a64.c | 1 - target/arm/helper.c | 12 ++---------- 2 files changed, 2 insertions(+), 11 deletions(-) -- 2.17.0 diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index 976eaba37a..5e51d1be9d 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -456,7 +456,6 @@ float32 HELPER(fcvtx_f64_to_f32)(float64 a, CPUARMState *env) set_float_rounding_mode(float_round_to_zero, &tstat); set_float_exception_flags(0, &tstat); r = float64_to_float32(a, &tstat); - r = float32_maybe_silence_nan(r, &tstat); exflags = get_float_exception_flags(&tstat); if (exflags & float_flag_inexact) { r = make_float32(float32_val(r) | 1); diff --git a/target/arm/helper.c b/target/arm/helper.c index 3065045e0c..61f8820487 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11369,20 +11369,12 @@ FLOAT_CONVS(ui, d, 64, u) /* floating point conversion */ float64 VFP_HELPER(fcvtd, s)(float32 x, CPUARMState *env) { - float64 r = float32_to_float64(x, &env->vfp.fp_status); - /* ARM requires that S<->D conversion of any kind of NaN generates - * a quiet NaN by forcing the most significant frac bit to 1. - */ - return float64_maybe_silence_nan(r, &env->vfp.fp_status); + return float32_to_float64(x, &env->vfp.fp_status); } float32 VFP_HELPER(fcvts, d)(float64 x, CPUARMState *env) { - float32 r = float64_to_float32(x, &env->vfp.fp_status); - /* ARM requires that S<->D conversion of any kind of NaN generates - * a quiet NaN by forcing the most significant frac bit to 1. - */ - return float32_maybe_silence_nan(r, &env->vfp.fp_status); + return float64_to_float32(x, &env->vfp.fp_status); } /* VFP3 fixed point conversion. */