7bb77ea74f
- Introduce the SM4 cipher algorithms (OSCCA GB/T 32907-2016).
- intel_iommu: Add missed sanity check for 256-bit invalidation queue
- linux-user: use 'max' instead of 'qemu32' / 'qemu64' by default
- chardev/baum: Use definitions to avoid dynamic stack allocation
- ui/console: Get tab completion working again in the SDL monitor vc
- s390x/tcg: Fix opcode for lzrf
- virtiofsd: use g_date_time_get_microsecond to get subsecond
- ui/curses: Avoid dynamic stack allocation
- target/m68k: always call gen_exit_tb() after writes to SR
- target/m68k: Perform writback before modifying SR
- target/m68k: Fix MACSR to CCR
- target/m68k: Implement atomic test-and-set
- block/nvme: nvme_process_completion() fix bound for cid
- hw/pci-host: pnv_phb{3, 4}: Fix heap out-of-bound access failure
- target/ppc: Zero second doubleword of VSR registers for FPR insns
- target/ppc: Set OV32 when OV is set
- target/ppc: Zero second doubleword for VSX madd instructions
- target/ppc: Set result to QNaN for DENBCD when VXCVI occurs
- hw/pci: Add parenthesis to PCI_BUILD_BDF macro
- intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL
- acpi: cpuhp: fix guest-visible maximum access size to the legacy reg block
- acpi: ged: Add macro for acpi sleep control register
- hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
- ui/vnc: fix handling of VNC_FEATURE_XVP
- s390/sclp: fix SCLP facility map
- docs/tools/qemu-img.rst: fix typo (sumarizes)
- chardev/char: fix qemu_chr_is_busy() check
- edu: fix DMA range upper bound check
- platform-bus: fix refcount leak
- hw/net/virtio-net: fix qemu set used ring flag even vhost started
- hw/net/can/sja1000: fix bug for single acceptance filter and standard frame
- tests/avocado: fix typo in replay_linux
- util/userfaultfd: Remove unused uffd_poll_events
- hw/core/ptimer: fix timer zero period condition for freq > 1GHz
- hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero
- tests/unit/test-vmstate: Avoid dynamic stack allocation
- hw/usb/hcd-ohci: Use definition to avoid dynamic stack allocation
- hw/i386/multiboot: Avoid dynamic stack allocation
- hw/ppc/spapr: Fix code style problems reported by checkpatch
- chardev/baum: Replace magic values by X_MAX / Y_MAX definitions
- hw/intc/xics: Avoid dynamic stack allocation
- hw/net/e1000e_core: Use definition to avoid dynamic stack allocation
- intel_iommu: Fix invalidation descriptor type field
- configs: Fix typo in the sh4-softmmu devices config file
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit 9813ed21ec2499c50cb58ac5fb114a1641708eb2)
85 lines
4.1 KiB
Diff
85 lines
4.1 KiB
Diff
From 05cee5f46432c4eb9774b53d014c5799bd924b8d Mon Sep 17 00:00:00 2001
|
|
From: Liu Jing <liujing_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 14 Oct 2024 15:54:33 +0800
|
|
Subject: [PATCH] target/ppc: Set result to QNaN for DENBCD when VXCVI occurs
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
According to the ISA, for instruction DENBCD:
|
|
"If an invalid BCD digit or sign code is detected in the source
|
|
operand, an invalid-operation exception (VXCVI) occurs."
|
|
|
|
In the Invalid Operation Exception section, there is the situation:
|
|
"When Invalid Operation Exception is disabled (VE=0) and Invalid
|
|
Operation occurs (...) If the operation is an (...) or format the
|
|
target FPR is set to a Quiet NaN". This was not being done in
|
|
QEMU.
|
|
|
|
This patch sets the result to QNaN when the instruction DENBCD causes
|
|
an Invalid Operation Exception.
|
|
|
|
Signed-off-by: Víctor Colombo <victor.colombo@eldorado.org.br>
|
|
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
Message-Id: <20220906125523.38765-5-victor.colombo@eldorado.org.br>
|
|
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
Signed-off-by: Liu Jing <liujing_yewu@cmss.chinamobile.com>
|
|
---
|
|
target/ppc/dfp_helper.c | 26 ++++++++++++++++++++++++--
|
|
1 file changed, 24 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/target/ppc/dfp_helper.c b/target/ppc/dfp_helper.c
|
|
index 0d01ac3de0..0398b3a50e 100644
|
|
--- a/target/ppc/dfp_helper.c
|
|
+++ b/target/ppc/dfp_helper.c
|
|
@@ -1144,6 +1144,26 @@ static inline uint8_t dfp_get_bcd_digit_128(ppc_vsr_t *t, unsigned n)
|
|
return t->VsrD((n & 0x10) ? 0 : 1) >> ((n << 2) & 63) & 15;
|
|
}
|
|
|
|
+static inline void dfp_invalid_op_vxcvi_64(struct PPC_DFP *dfp)
|
|
+{
|
|
+ /* TODO: fpscr is incorrectly not being saved to env */
|
|
+ dfp_set_FPSCR_flag(dfp, FP_VX | FP_VXCVI, FPSCR_VE);
|
|
+ if ((dfp->env->fpscr & FP_VE) == 0) {
|
|
+ dfp->vt.VsrD(1) = 0x7c00000000000000; /* QNaN */
|
|
+ }
|
|
+}
|
|
+
|
|
+
|
|
+static inline void dfp_invalid_op_vxcvi_128(struct PPC_DFP *dfp)
|
|
+{
|
|
+ /* TODO: fpscr is incorrectly not being saved to env */
|
|
+ dfp_set_FPSCR_flag(dfp, FP_VX | FP_VXCVI, FPSCR_VE);
|
|
+ if ((dfp->env->fpscr & FP_VE) == 0) {
|
|
+ dfp->vt.VsrD(0) = 0x7c00000000000000; /* QNaN */
|
|
+ dfp->vt.VsrD(1) = 0x0;
|
|
+ }
|
|
+}
|
|
+
|
|
#define DFP_HELPER_ENBCD(op, size) \
|
|
void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *b, \
|
|
uint32_t s) \
|
|
@@ -1170,7 +1190,8 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *b, \
|
|
sgn = 0; \
|
|
break; \
|
|
default: \
|
|
- dfp_set_FPSCR_flag(&dfp, FP_VX | FP_VXCVI, FPSCR_VE); \
|
|
+ dfp_invalid_op_vxcvi_##size(&dfp); \
|
|
+ set_dfp##size(t, &dfp.vt); \
|
|
return; \
|
|
} \
|
|
} \
|
|
@@ -1180,7 +1201,8 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *b, \
|
|
digits[(size) / 4 - n] = dfp_get_bcd_digit_##size(&dfp.vb, \
|
|
offset++); \
|
|
if (digits[(size) / 4 - n] > 10) { \
|
|
- dfp_set_FPSCR_flag(&dfp, FP_VX | FP_VXCVI, FPSCR_VE); \
|
|
+ dfp_invalid_op_vxcvi_##size(&dfp); \
|
|
+ set_dfp##size(t, &dfp.vt); \
|
|
return; \
|
|
} else { \
|
|
nonzero |= (digits[(size) / 4 - n] > 0); \
|
|
--
|
|
2.41.0.windows.1
|
|
|