From nobody Thu Nov 6 06:20:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539301648932952.5859006079972; Thu, 11 Oct 2018 16:47:28 -0700 (PDT) Received: from localhost ([::1]:37583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAkfv-0005FK-RB for importer@patchew.org; Thu, 11 Oct 2018 19:47:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAkat-0001po-Fw for qemu-devel@nongnu.org; Thu, 11 Oct 2018 19:42:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAkaq-0002K1-St for qemu-devel@nongnu.org; Thu, 11 Oct 2018 19:42:15 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:33528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gAkaq-0002Hj-IP for qemu-devel@nongnu.org; Thu, 11 Oct 2018 19:42:12 -0400 Received: by mail-pl1-x62f.google.com with SMTP id s4-v6so4986189plp.0 for ; Thu, 11 Oct 2018 16:42:11 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id o12-v6sm12258302pgv.7.2018.10.11.16.42.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Oct 2018 16:42:09 -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=rrqbySltHZh/y/niyNjXAqezkud1K+S4DIN9GBBTBW4=; b=cibegZFPMyi/FVk4pyMzBNJ1Ke3PIhA/g4PpXoBc28gSr4F3M5DoLbeRD++du6M9s9 7WhpPeE5vKoa/S4/lPalCEyT3fZeMsPJq7I70qA0uEMJne+7gnagNm9P3i+T3GfHhxPn dHxQTSOKIDX9gGU7NKXRE3QiNFQoValav18mQ= 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=rrqbySltHZh/y/niyNjXAqezkud1K+S4DIN9GBBTBW4=; b=Ev0fC6DtXBY6H1/sRH6XjR98Tq3TI96aBel9dEAt98n5YUfgwydiwmFblGDe9Zk4Jt HwlaCJkzndvhPDd7qBXnMAc/3vXUW10po3oUWlw+2FRTApUZOglca1Qyh61qweLCea/A 8Zh5Ra2lNzODsiZ0r5roBhD3NYLzGWxAkXUeo6zudIlzGvQFBcKYVMT35Hzs3uUMoguV 8hCrnEz51Ge5f8JrFb9ZiGWqYW0M+1DduZFbHuCz8FUomNh7OHEm0hMbC8oZvLUbSGPY BIOm5J6eKUn5FjzhL0nHqiWTHLy9/SM9IScDcdy8eGhp9plKj82TRxlZRrnAT8fxVCEb D5Xw== X-Gm-Message-State: ABuFfojZyyvk0DevURJL/9/JPmqLxTu6AT3BSct6A8YTyn6nQ0n7xCkk B1C4xo4FqpoK/PVA48xAhk9rUnXAYdY= X-Google-Smtp-Source: ACcGV62bqQkkHMEmtQK9C207FbE6PBTFtVkD2cUfU8dJbeZgT/cuH1VKs81JfF0DlH5zRgmqxj4O4g== X-Received: by 2002:a17:902:680e:: with SMTP id h14-v6mr3478209plk.177.1539301329914; Thu, 11 Oct 2018 16:42:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 11 Oct 2018 16:41:58 -0700 Message-Id: <20181011234159.11496-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181011234159.11496-1-richard.henderson@linaro.org> References: <20181011234159.11496-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62f Subject: [Qemu-devel] [PATCH 6/7] target/ppc: Split out float_invalid_op_div 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: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- target/ppc/fpu_helper.c | 52 +++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index ef251d062f..127c08bcec 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -715,6 +715,21 @@ float64 helper_fmul(CPUPPCState *env, float64 arg1, fl= oat64 arg2) return ret; } =20 +static void float_invalid_op_div(CPUPPCState *env, bool set_fprc, + uintptr_t retaddr, int classes) +{ + classes &=3D ~is_neg; + if (classes =3D=3D is_inf) { + /* Division of infinity by infinity */ + float_invalid_op_vxidi(env, set_fprc, retaddr); + } else if (classes =3D=3D is_zero) { + /* Division of zero by zero */ + float_invalid_op_vxzdz(env, set_fprc, retaddr); + } else if (classes & is_snan) { + float_invalid_op_vxsnan(env, retaddr); + } +} + /* fdiv - fdiv. */ float64 helper_fdiv(CPUPPCState *env, float64 arg1, float64 arg2) { @@ -723,18 +738,9 @@ float64 helper_fdiv(CPUPPCState *env, float64 arg1, fl= oat64 arg2) =20 if (unlikely(status)) { if (status & float_flag_invalid) { - /* Determine what kind of invalid operation was seen. */ - if (float64_is_infinity(arg1) && float64_is_infinity(arg2)) { - /* Division of infinity by infinity */ - float_invalid_op_vxidi(env, 1, GETPC()); - } else if (float64_is_zero(arg1) && float64_is_zero(arg2)) { - /* Division of zero by zero */ - float_invalid_op_vxzdz(env, 1, GETPC()); - } else if (float64_is_signaling_nan(arg1, &env->fp_status) || - float64_is_signaling_nan(arg2, &env->fp_status)) { - /* sNaN division */ - float_invalid_op_vxsnan(env, GETPC()); - } + float_invalid_op_div(env, 1, GETPC(), + float64_classify(arg1) | + float64_classify(arg2)); } if (status & float_flag_divbyzero) { float_zero_divide_excp(env, GETPC()); @@ -1969,14 +1975,9 @@ void helper_##op(CPUPPCState *env, uint32_t opcode) = \ env->fp_status.float_exception_flags |=3D tstat.float_exception_fl= ags; \ = \ if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { = \ - if (tp##_is_infinity(xa.fld) && tp##_is_infinity(xb.fld)) { = \ - float_invalid_op_vxidi(env, sfprf, GETPC()); = \ - } else if (tp##_is_zero(xa.fld) && tp##_is_zero(xb.fld)) { = \ - float_invalid_op_vxzdz(env, sfprf, GETPC()); = \ - } else if (tp##_is_signaling_nan(xa.fld, &tstat) || = \ - tp##_is_signaling_nan(xb.fld, &tstat)) { = \ - float_invalid_op_vxsnan(env, GETPC()); = \ - } = \ + float_invalid_op_div(env, sfprf, GETPC(), = \ + tp##_classify(xa.fld) | = \ + tp##_classify(xb.fld)); = \ } = \ if (unlikely(tstat.float_exception_flags & float_flag_divbyzero)) = { \ float_zero_divide_excp(env, GETPC()); = \ @@ -2020,14 +2021,9 @@ void helper_xsdivqp(CPUPPCState *env, uint32_t opcod= e) env->fp_status.float_exception_flags |=3D tstat.float_exception_flags; =20 if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { - if (float128_is_infinity(xa.f128) && float128_is_infinity(xb.f128)= ) { - float_invalid_op_vxidi(env, 1, GETPC()); - } else if (float128_is_zero(xa.f128) && float128_is_zero(xb.f128))= { - float_invalid_op_vxzdz(env, 1, GETPC()); - } else if (float128_is_signaling_nan(xa.f128, &tstat) || - float128_is_signaling_nan(xb.f128, &tstat)) { - float_invalid_op_vxsnan(env, GETPC()); - } + float_invalid_op_div(env, 1, GETPC(), + float128_classify(xa.f128) | + float128_classify(xb.f128)); } if (unlikely(tstat.float_exception_flags & float_flag_divbyzero)) { float_zero_divide_excp(env, GETPC()); --=20 2.17.1