qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@kaod.org>
To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Cédric Le Goater" <clg@kaod.org>
Subject: [PULL 053/101] target/ppc: Use helper_todouble/tosingle in helper_xststdcsp
Date: Thu, 16 Dec 2021 21:25:26 +0100	[thread overview]
Message-ID: <20211216202614.414266-54-clg@kaod.org> (raw)
In-Reply-To: <20211216202614.414266-1-clg@kaod.org>

From: Richard Henderson <richard.henderson@linaro.org>

When computing the predicate "is this value currently formatted
for single precision", we do not want to round the value according
to the current rounding mode, nor perform a floating-point equality.
We want to see if the N bits that make up single-precision are the
only ones set within the register, and then a bitwise equality.

Fixes a bug in which a single-precision NaN is considered !SP,
because float64_eq(nan, nan) is always false.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20211119160502.17432-35-richard.henderson@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 target/ppc/fpu_helper.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c
index c955b20739ac..1e9a16154036 100644
--- a/target/ppc/fpu_helper.c
+++ b/target/ppc/fpu_helper.c
@@ -3163,26 +3163,25 @@ void helper_xststdcsp(CPUPPCState *env, uint32_t opcode, ppc_vsr_t *xb)
 {
     uint32_t dcmx, sign, exp;
     uint32_t cc, match = 0, not_sp = 0;
+    float64 arg = xb->VsrD(0);
+    float64 arg_sp;
 
     dcmx = DCMX(opcode);
-    exp = (xb->VsrD(0) >> 52) & 0x7FF;
+    exp = (arg >> 52) & 0x7FF;
+    sign = float64_is_neg(arg);
 
-    sign = float64_is_neg(xb->VsrD(0));
-    if (float64_is_any_nan(xb->VsrD(0))) {
+    if (float64_is_any_nan(arg)) {
         match = extract32(dcmx, 6, 1);
-    } else if (float64_is_infinity(xb->VsrD(0))) {
+    } else if (float64_is_infinity(arg)) {
         match = extract32(dcmx, 4 + !sign, 1);
-    } else if (float64_is_zero(xb->VsrD(0))) {
+    } else if (float64_is_zero(arg)) {
         match = extract32(dcmx, 2 + !sign, 1);
-    } else if (float64_is_zero_or_denormal(xb->VsrD(0)) ||
-               (exp > 0 && exp < 0x381)) {
+    } else if (float64_is_zero_or_denormal(arg) || (exp > 0 && exp < 0x381)) {
         match = extract32(dcmx, 0 + !sign, 1);
     }
 
-    not_sp = !float64_eq(xb->VsrD(0),
-                         float32_to_float64(
-                             float64_to_float32(xb->VsrD(0), &env->fp_status),
-                             &env->fp_status), &env->fp_status);
+    arg_sp = helper_todouble(helper_tosingle(arg));
+    not_sp = arg != arg_sp;
 
     cc = sign << CRF_LT_BIT | match << CRF_EQ_BIT | not_sp << CRF_SO_BIT;
     env->fpscr &= ~FP_FPCC;
-- 
2.31.1



  parent reply	other threads:[~2021-12-16 21:34 UTC|newest]

Thread overview: 107+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-16 20:24 [PULL v2 000/101] ppc queue Cédric Le Goater
2021-12-16 20:24 ` [PULL 001/101] pseries: Update SLOF firmware image Cédric Le Goater
2021-12-16 20:24 ` [PULL 002/101] hw/ppc/mac.h: Remove MAX_CPUS macro Cédric Le Goater
2021-12-16 20:24 ` [PULL 003/101] target/ppc: Fixed call to deferred exception Cédric Le Goater
2021-12-16 20:24 ` [PULL 004/101] test/tcg/ppc64le: test mtfsf Cédric Le Goater
2021-12-16 20:24 ` [PULL 005/101] target/ppc: ppc_store_fpscr doesn't update bits 0 to 28 and 52 Cédric Le Goater
2021-12-16 20:24 ` [PULL 006/101] target/ppc: Implement Vector Expand Mask Cédric Le Goater
2021-12-16 20:24 ` [PULL 007/101] target/ppc: Implement Vector Extract Mask Cédric Le Goater
2021-12-16 20:24 ` [PULL 008/101] target/ppc: Implement Vector Mask Move insns Cédric Le Goater
2021-12-16 20:24 ` [PULL 009/101] ivshmem.c: change endianness to LITTLE_ENDIAN Cédric Le Goater
2021-12-16 20:24 ` [PULL 010/101] ivshmem-test.c: enable test_ivshmem_server for ppc64 arch Cédric Le Goater
2021-12-16 20:24 ` [PULL 011/101] pci-host: Allow extended config space access for PowerNV PHB4 model Cédric Le Goater
2021-12-16 20:24 ` [PULL 012/101] docs: Minor updates on the powernv documentation Cédric Le Goater
2021-12-16 20:24 ` [PULL 013/101] ppc/pnv.c: add a friendly warning when accel=kvm is used Cédric Le Goater
2021-12-16 20:24 ` [PULL 014/101] docs/system/ppc/powernv.rst: document KVM support status Cédric Le Goater
2021-12-16 20:24 ` [PULL 015/101] ppc/pnv.c: fix "system-id" FDT when -uuid is set Cédric Le Goater
2021-12-16 20:24 ` [PULL 016/101] docs: Introducing pseries documentation Cédric Le Goater
2021-12-16 20:24 ` [PULL 017/101] docs: rSTify ppc-spapr-hcalls.txt Cédric Le Goater
2021-12-16 20:24 ` [PULL 018/101] docs: Rename ppc-spapr-hcalls.txt to ppc-spapr-hcalls.rst Cédric Le Goater
2021-12-16 20:24 ` [PULL 019/101] Link new ppc-spapr-hcalls.rst file to pseries.rst Cédric Le Goater
2021-12-16 20:24 ` [PULL 020/101] softfloat: Extend float_exception_flags to 16 bits Cédric Le Goater
2021-12-16 20:24 ` [PULL 021/101] softfloat: Add flag specific to Inf - Inf Cédric Le Goater
2021-12-16 20:24 ` [PULL 022/101] softfloat: Add flag specific to Inf * 0 Cédric Le Goater
2021-12-16 20:24 ` [PULL 023/101] softfloat: Add flags specific to Inf / Inf and 0 / 0 Cédric Le Goater
2021-12-16 20:24 ` [PULL 024/101] softfloat: Add flag specific to sqrt(-x) Cédric Le Goater
2021-12-16 20:24 ` [PULL 025/101] softfloat: Add flag specific to convert non-nan to int Cédric Le Goater
2021-12-16 20:24 ` [PULL 026/101] softfloat: Add flag specific to signaling nans Cédric Le Goater
2021-12-16 20:25 ` [PULL 027/101] target/ppc: Update float_invalid_op_addsub for new flags Cédric Le Goater
2021-12-16 20:25 ` [PULL 028/101] target/ppc: Update float_invalid_op_mul " Cédric Le Goater
2021-12-16 20:25 ` [PULL 029/101] target/ppc: Update float_invalid_op_div " Cédric Le Goater
2021-12-16 20:25 ` [PULL 030/101] target/ppc: Move float_check_status from FPU_FCTI to translate Cédric Le Goater
2021-12-16 20:25 ` [PULL 031/101] target/ppc: Update float_invalid_cvt for new flags Cédric Le Goater
2021-12-16 20:25 ` [PULL 032/101] target/ppc: Fix VXCVI return value Cédric Le Goater
2021-12-16 20:25 ` [PULL 033/101] target/ppc: Remove inline from do_fri Cédric Le Goater
2021-12-16 20:25 ` [PULL 034/101] target/ppc: Use FloatRoundMode in do_fri Cédric Le Goater
2021-12-16 20:25 ` [PULL 035/101] target/ppc: Tidy inexact handling " Cédric Le Goater
2021-12-16 20:25 ` [PULL 036/101] target/ppc: Clean up do_fri Cédric Le Goater
2021-12-16 20:25 ` [PULL 037/101] target/ppc: Update fmadd for new flags Cédric Le Goater
2021-12-16 20:25 ` [PULL 038/101] target/ppc: Split out do_fmadd Cédric Le Goater
2021-12-16 20:25 ` [PULL 039/101] target/ppc: Do not call do_float_check_status from do_fmadd Cédric Le Goater
2021-12-16 20:25 ` [PULL 040/101] target/ppc: Split out do_frsp Cédric Le Goater
2021-12-16 20:25 ` [PULL 041/101] target/ppc: Update do_frsp for new flags Cédric Le Goater
2021-12-16 20:25 ` [PULL 042/101] target/ppc: Use helper_todouble in do_frsp Cédric Le Goater
2021-12-16 20:25 ` [PULL 043/101] target/ppc: Update sqrt for new flags Cédric Le Goater
2021-12-16 20:25 ` [PULL 044/101] target/ppc: Update xsrqpi and xsrqpxp to " Cédric Le Goater
2021-12-16 20:25 ` [PULL 045/101] target/ppc: Update fre " Cédric Le Goater
2021-12-16 20:25 ` [PULL 046/101] softfloat: Add float64r32 arithmetic routines Cédric Le Goater
2021-12-16 20:25 ` [PULL 047/101] target/ppc: Add helpers for fmadds et al Cédric Le Goater
2021-12-16 20:25 ` [PULL 048/101] target/ppc: Add helper for fsqrts Cédric Le Goater
2021-12-16 20:25 ` [PULL 049/101] target/ppc: Add helpers for fadds, fsubs, fdivs Cédric Le Goater
2021-12-16 20:25 ` [PULL 050/101] target/ppc: Add helper for fmuls Cédric Le Goater
2021-12-16 20:25 ` [PULL 051/101] target/ppc: Add helper for frsqrtes Cédric Le Goater
2021-12-16 20:25 ` [PULL 052/101] target/ppc: Update fres to new flags and float64r32 Cédric Le Goater
2021-12-16 20:25 ` Cédric Le Goater [this message]
2021-12-16 20:25 ` [PULL 054/101] target/ppc: Disable software TLB for the 7450 family Cédric Le Goater
2021-12-16 20:25 ` [PULL 055/101] target/ppc: Disable unused facilities in the e600 CPU Cédric Le Goater
2021-12-16 20:25 ` [PULL 056/101] target/ppc: Remove the software TLB model of 7450 CPUs Cédric Le Goater
2021-12-16 20:25 ` [PULL 057/101] target/ppc: Fix MPCxxx FPU interrupt address Cédric Le Goater
2021-12-16 20:25 ` [PULL 058/101] target/ppc: Remove 603e exception model Cédric Le Goater
2021-12-16 20:25 ` [PULL 059/101] target/ppc: Set 601v exception model id Cédric Le Goater
2021-12-16 20:25 ` [PULL 060/101] target/ppc: remove 401/403 CPUs Cédric Le Goater
2021-12-16 20:25 ` [PULL 061/101] ppc/ppc405: Change kernel load address Cédric Le Goater
2021-12-16 20:25 ` [PULL 062/101] ppc: Mark the 'taihu' machine as deprecated Cédric Le Goater
2021-12-16 20:25 ` [PULL 063/101] ppc: Add trace-events for DCR accesses Cédric Le Goater
2021-12-16 20:25 ` [PULL 064/101] ppc/ppc405: Convert printfs to trace-events Cédric Le Goater
2021-12-16 20:25 ` [PULL 065/101] ppc/ppc405: Drop flag parameter in ppc405_set_bootinfo() Cédric Le Goater
2021-12-16 20:25 ` [PULL 066/101] ppc/ppc405: Change ppc405ep_init() return value Cédric Le Goater
2021-12-16 20:25 ` [PULL 067/101] ppc/ppc405: Add some address space definitions Cédric Le Goater
2021-12-16 20:25 ` [PULL 068/101] ppc/ppc405: Remove flash support Cédric Le Goater
2021-12-16 20:25 ` [PULL 069/101] ppc/ppc405: Rework FW load Cédric Le Goater
2021-12-16 20:25 ` [PULL 070/101] ppc/ppc405: Introduce ppc405_set_default_bootinfo() Cédric Le Goater
2021-12-16 20:25 ` [PULL 071/101] ppc/ppc405: Fix boot from kernel Cédric Le Goater
2021-12-16 20:25 ` [PULL 072/101] ppc/ppc405: Change default PLL values at reset Cédric Le Goater
2021-12-16 20:25 ` [PULL 073/101] ppc/ppc405: Fix bi_pci_enetaddr2 field in U-Boot board information Cédric Le Goater
2021-12-16 20:25 ` [PULL 074/101] ppc/ppc405: Add update of bi_procfreq field Cédric Le Goater
2021-12-16 20:25 ` [PULL 075/101] target/ppc: Fix xs{max, min}[cj]dp to use VSX registers Cédric Le Goater
2021-12-16 20:25 ` [PULL 076/101] target/ppc: Move xs{max,min}[cj]dp to decodetree Cédric Le Goater
2021-12-16 20:25 ` [PULL 077/101] target/ppc: fix xscvqpdp register access Cédric Le Goater
2021-12-16 20:25 ` [PULL 078/101] target/ppc: move xscvqpdp to decodetree Cédric Le Goater
2021-12-16 20:25 ` [PULL 079/101] target/ppc: Fix e6500 boot Cédric Le Goater
2021-12-16 20:25 ` [PULL 080/101] Revert "target/ppc: Move SPR_DSISR setting to powerpc_excp" Cédric Le Goater
2021-12-16 20:25 ` [PULL 081/101] target/ppc: introduce PMUEventType and PMU overflow timers Cédric Le Goater
2021-12-16 20:25 ` [PULL 082/101] target/ppc: PMU basic cycle count for pseries TCG Cédric Le Goater
2021-12-16 20:25 ` [PULL 083/101] target/ppc: PMU: update counters on PMCs r/w Cédric Le Goater
2021-12-16 20:25 ` [PULL 084/101] target/ppc: PMU: update counters on MMCR1 write Cédric Le Goater
2021-12-16 20:25 ` [PULL 085/101] target/ppc: enable PMU counter overflow with cycle events Cédric Le Goater
2021-12-16 20:25 ` [PULL 086/101] target/ppc: enable PMU instruction count Cédric Le Goater
2021-12-16 20:26 ` [PULL 087/101] target/ppc/power8-pmu.c: add PM_RUN_INST_CMPL (0xFA) event Cédric Le Goater
2021-12-16 20:26 ` [PULL 088/101] PPC64/TCG: Implement 'rfebb' instruction Cédric Le Goater
2021-12-16 20:26 ` [PULL 089/101] ppc/pnv: Introduce a "chip" property under PHB3 Cédric Le Goater
2021-12-16 20:26 ` [PULL 090/101] ppc/pnv: Use the chip class to check the index of PHB3 devices Cédric Le Goater
2021-12-16 20:26 ` [PULL 091/101] ppc/pnv: Drop the "num-phbs" property Cédric Le Goater
2021-12-16 20:26 ` [PULL 092/101] ppc/pnv: Move mapping of the PHB3 CQ regions under pnv_pbcq_realize() Cédric Le Goater
2021-12-16 20:26 ` [PULL 093/101] ppc/pnv: Use QOM hierarchy to scan PHB3 devices Cédric Le Goater
2021-12-16 20:26 ` [PULL 094/101] ppc/pnv: Introduce a num_pecs class attribute for PHB4 PEC devices Cédric Le Goater
2021-12-16 20:26 ` [PULL 095/101] ppc/pnv: Introduce version and device_id class atributes for PHB4 devices Cédric Le Goater
2021-12-16 20:26 ` [PULL 096/101] ppc/pnv: Introduce a "chip" property under the PHB4 model Cédric Le Goater
2021-12-16 20:26 ` [PULL 097/101] ppc/pnv: Introduce a num_stack class attribute Cédric Le Goater
2021-12-16 20:26 ` [PULL 098/101] ppc/pnv: Compute the PHB index from the PHB4 PEC model Cédric Le Goater
2021-12-16 20:26 ` [PULL 099/101] ppc/pnv: Remove "system-memory" property from PHB4 PEC Cédric Le Goater
2021-12-16 20:26 ` [PULL 100/101] ppc/pnv: Move realize of PEC stacks under the PEC model Cédric Le Goater
2021-12-16 20:26 ` [PULL 101/101] ppc/pnv: Use QOM hierarchy to scan PEC PHB4 devices Cédric Le Goater
2021-12-17 16:33 ` [PULL v2 000/101] ppc queue Richard Henderson
2021-12-17 16:46   ` Cédric Le Goater
2021-12-17 17:24     ` Richard Henderson
2021-12-17 17:31       ` Cédric Le Goater
2021-12-17 17:34         ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211216202614.414266-54-clg@kaod.org \
    --to=clg@kaod.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).