From patchwork Thu Nov 8 12:16:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 150508 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp760254ljp; Thu, 8 Nov 2018 04:29:27 -0800 (PST) X-Google-Smtp-Source: AJdET5ckzTrVfN4sbLSmPiv50V/6ZS63MCPJhAFSB4OzjyHpkhcGyd+C1oXApcQ7AXmacg84wgKG X-Received: by 2002:aed:23d8:: with SMTP id k24-v6mr4136662qtc.39.1541680167222; Thu, 08 Nov 2018 04:29:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541680167; cv=none; d=google.com; s=arc-20160816; b=wiuwz3QWIHN6DvrjQm0E1kdrGLBFGNOACBYrxScRrHwrQ6x0Z9vBx3ni1x8jw6jJn1 HqqAHUIwUt0SRlyp3ns1HM9zI1keKPw9DTcCipZPuSat84djwEtE5Q3cLtJezldHXDgs 8gQABQgxOrIs8+OnyB5+SXnsbyeLCqa2k/06tRaA8pUVriJSTWUL/AMCEOOJmNau+OHs DaEFa1bZ5CuGayhMo+4x5bphWu0wkKfBleM9XxPH/xwR8E2IRWRq0HYcBo2Ij9tbwJGA MkAyrFEGAe9pCAu1DjrRA5EzGv9d0WMPNRmikT9B4x3mfNJKqA5n8LAgkERSj55lGNCY cLYA== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=6/URoz3QGt0sHy1VRYqVxnzUDTA2pXJofjtWJaNOy+c=; b=dmotZ7aHDzPsYY2ouISM1htpl9YsnnpIKF5DLrVIv1ja3uGshvpyEVZENcNdsGIvlQ GZUdSNuTyu83c6Lu/UOxphu2/NPovKL9gcVQiadCWf8sqxe7WJSRWWqghLGvNstCB14Q tWOVqhKIg4qrC7LcTWIU65jfd2jc3Gjis5pWJT4gr0caW9nFuUKswkDW0AvdbE/BzPMF mZT22mHeD9F8ZFkj7Mq/1YHG19pWDhbA106j2CWN7aVjR11ILsccni8uY3zTXo0mz4Pm 4pfbvSagfrk6rIIxPvO+lPHfDmlrcbW/h2/3JtO0LY16IHeg/yv6+ta+1L/pR+2t9aI0 h+6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gibson.dropbear.id.au header.s=201602 header.b=NxaTcFV1; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c7si3079020qkj.67.2018.11.08.04.29.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 08 Nov 2018 04:29:27 -0800 (PST) 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=neutral (body hash did not verify) header.i=@gibson.dropbear.id.au header.s=201602 header.b=NxaTcFV1; 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" Received: from localhost ([::1]:56315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKjR8-0005dY-7M for patch@linaro.org; Thu, 08 Nov 2018 07:29:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKjFI-0005Gc-LZ for qemu-devel@nongnu.org; Thu, 08 Nov 2018 07:17:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKjFF-0003iw-VE for qemu-devel@nongnu.org; Thu, 08 Nov 2018 07:17:12 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:44029) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gKjF8-0003at-S6; Thu, 08 Nov 2018 07:17:04 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 42rMj01wrmz9sDT; Thu, 8 Nov 2018 23:16:51 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1541679412; bh=SEgsqD9Kv2vjT3C3MPL+PuFeLmBYOgNwhYJnA0LjKkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NxaTcFV1mUGOD5OUodWx2ipSTDiNrdw1SrZZOda6zaBNx9QoqZYOQW2bMNEJ3TjmK xdEuR5ToWyuczLfxU6h/MWJjMSxd3phS3C55lwK0dEI2G+m47BObzI3zAjjgbH7GoC 59f1zSXAN8SFPjjCYLIYU5HxYRFTHJpzNoTAtymg= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 8 Nov 2018 23:16:32 +1100 Message-Id: <20181108121646.26173-9-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181108121646.26173-1-david@gibson.dropbear.id.au> References: <20181108121646.26173-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 08/22] target/ppc: Introduce fp number classification 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: lvivier@redhat.com, Richard Henderson , agraf@suse.de, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Having a separate, logical classifiation of numbers will unify more error paths for different formats. Signed-off-by: Richard Henderson Signed-off-by: David Gibson --- target/ppc/fpu_helper.c | 94 ++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 43 deletions(-) -- 2.19.1 diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index c9198f826d..9ae55b1e93 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -114,54 +114,62 @@ static inline int ppc_float64_get_unbiased_exp(float64 f) return ((f >> 52) & 0x7FF) - 1023; } -#define COMPUTE_FPRF(tp) \ -void helper_compute_fprf_##tp(CPUPPCState *env, tp arg) \ +/* Classify a floating-point number. */ +enum { + is_normal = 1, + is_zero = 2, + is_denormal = 4, + is_inf = 8, + is_qnan = 16, + is_snan = 32, + is_neg = 64, +}; + +#define COMPUTE_CLASS(tp) \ +static int tp##_classify(tp arg) \ { \ - int isneg; \ - int fprf; \ - \ - isneg = tp##_is_neg(arg); \ + int ret = tp##_is_neg(arg) * is_neg; \ if (unlikely(tp##_is_any_nan(arg))) { \ - if (tp##_is_signaling_nan(arg, &env->fp_status)) { \ - /* Signaling NaN: flags are undefined */ \ - fprf = 0x00; \ - } else { \ - /* Quiet NaN */ \ - fprf = 0x11; \ - } \ + float_status dummy = { }; /* snan_bit_is_one = 0 */ \ + ret |= (tp##_is_signaling_nan(arg, &dummy) \ + ? is_snan : is_qnan); \ } else if (unlikely(tp##_is_infinity(arg))) { \ - /* +/- infinity */ \ - if (isneg) { \ - fprf = 0x09; \ - } else { \ - fprf = 0x05; \ - } \ + ret |= is_inf; \ + } else if (tp##_is_zero(arg)) { \ + ret |= is_zero; \ + } else if (tp##_is_zero_or_denormal(arg)) { \ + ret |= is_denormal; \ } else { \ - if (tp##_is_zero(arg)) { \ - /* +/- zero */ \ - if (isneg) { \ - fprf = 0x12; \ - } else { \ - fprf = 0x02; \ - } \ - } else { \ - if (tp##_is_zero_or_denormal(arg)) { \ - /* Denormalized numbers */ \ - fprf = 0x10; \ - } else { \ - /* Normalized numbers */ \ - fprf = 0x00; \ - } \ - if (isneg) { \ - fprf |= 0x08; \ - } else { \ - fprf |= 0x04; \ - } \ - } \ + ret |= is_normal; \ } \ - /* We update FPSCR_FPRF */ \ - env->fpscr &= ~(0x1F << FPSCR_FPRF); \ - env->fpscr |= fprf << FPSCR_FPRF; \ + return ret; \ +} + +COMPUTE_CLASS(float16) +COMPUTE_CLASS(float32) +COMPUTE_CLASS(float64) +COMPUTE_CLASS(float128) + +static void set_fprf_from_class(CPUPPCState *env, int class) +{ + static const uint8_t fprf[6][2] = { + { 0x04, 0x08 }, /* normalized */ + { 0x02, 0x12 }, /* zero */ + { 0x14, 0x18 }, /* denormalized */ + { 0x05, 0x09 }, /* infinity */ + { 0x11, 0x11 }, /* qnan */ + { 0x00, 0x00 }, /* snan -- flags are undefined */ + }; + bool isneg = class & is_neg; + + env->fpscr &= ~(0x1F << FPSCR_FPRF); + env->fpscr |= fprf[ctz32(class)][isneg] << FPSCR_FPRF; +} + +#define COMPUTE_FPRF(tp) \ +void helper_compute_fprf_##tp(CPUPPCState *env, tp arg) \ +{ \ + set_fprf_from_class(env, tp##_classify(arg)); \ } COMPUTE_FPRF(float16)