[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 13/24] linux-user/microblaze: Fix SIGFPE si_codes
From: |
Richard Henderson |
Subject: |
[PATCH v4 13/24] linux-user/microblaze: Fix SIGFPE si_codes |
Date: |
Mon, 20 Dec 2021 13:05:17 -0800 |
Fix a typo for ESR_EC_DIVZERO, which is integral not floating-point.
Fix the if ladder for decoding floating-point exceptions.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/microblaze/cpu_loop.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/linux-user/microblaze/cpu_loop.c b/linux-user/microblaze/cpu_loop.c
index 263b68aea1..cf1668a45f 100644
--- a/linux-user/microblaze/cpu_loop.c
+++ b/linux-user/microblaze/cpu_loop.c
@@ -77,15 +77,25 @@ void cpu_loop(CPUMBState *env)
env->iflags &= ~(IMM_FLAG | D_FLAG);
switch (env->esr & 31) {
case ESR_EC_DIVZERO:
- si_code = TARGET_FPE_FLTDIV;
+ si_code = TARGET_FPE_INTDIV;
break;
case ESR_EC_FPU:
- si_code = 0;
- if (env->fsr & FSR_IO) {
+ /*
+ * Note that the kernel passes along fsr as si_code
+ * if there's no recognized bit set. Possibly this
+ * implies that si_code is 0, but follow the structure.
+ */
+ si_code = env->fsr;
+ if (si_code & FSR_IO) {
si_code = TARGET_FPE_FLTINV;
- }
- if (env->fsr & FSR_DZ) {
+ } else if (si_code & FSR_OF) {
+ si_code = TARGET_FPE_FLTOVF;
+ } else if (si_code & FSR_UF) {
+ si_code = TARGET_FPE_FLTUND;
+ } else if (si_code & FSR_DZ) {
si_code = TARGET_FPE_FLTDIV;
+ } else if (si_code & FSR_DO) {
+ si_code = TARGET_FPE_FLTRES;
}
break;
default:
--
2.25.1
- [PATCH v4 07/24] linux-user: Remove TARGET_NSIGFPE, (continued)
- [PATCH v4 07/24] linux-user: Remove TARGET_NSIGFPE, Richard Henderson, 2021/12/20
- [PATCH v4 05/24] linux-user/hppa: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 08/24] linux-user/hppa: Set FPE_CONDTRAP for COND, Richard Henderson, 2021/12/20
- [PATCH v4 09/24] linux-user/i386: Split out maybe_handle_vm86_trap, Richard Henderson, 2021/12/20
- [PATCH v4 10/24] linux-user/i386: Use force_sig, force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 11/24] linux-user/m68k: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 12/24] linux-user/microblaze: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 14/24] linux-user/mips: Improve do_break, Richard Henderson, 2021/12/20
- [PATCH v4 15/24] linux-user/mips: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 16/24] target/mips: Extract break code into env->error_code, Richard Henderson, 2021/12/20
- [PATCH v4 13/24] linux-user/microblaze: Fix SIGFPE si_codes,
Richard Henderson <=
- [PATCH v4 18/24] linux-user/openrisc: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 20/24] linux-user/riscv: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 17/24] target/mips: Extract trap code into env->error_code, Richard Henderson, 2021/12/20
- [PATCH v4 19/24] linux-user/ppc: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 21/24] linux-user/s390x: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 23/24] linux-user/sparc: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 22/24] linux-user/sh4: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 24/24] linux-user/xtensa: Use force_sig_fault, Richard Henderson, 2021/12/20