[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 21/30] linux-user/microblaze: Fix SIGFPE si_codes
From: |
Richard Henderson |
Subject: |
[PATCH v2 21/30] linux-user/microblaze: Fix SIGFPE si_codes |
Date: |
Sat, 21 Aug 2021 20:55:28 -0700 |
Fix a typo for ESR_EC_DIVZERO, which is integral not floating-point.
Fix the if ladder for decoding floating-point exceptions.
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 9e07e52573..4a75c853b2 100644
--- a/linux-user/microblaze/cpu_loop.c
+++ b/linux-user/microblaze/cpu_loop.c
@@ -81,15 +81,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 v2 10/30] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, (continued)
- [PATCH v2 10/30] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, Richard Henderson, 2021/08/21
- [PATCH v2 11/30] linux-user/alpha: Use force_sig_fault, force_sigsegv_code, Richard Henderson, 2021/08/21
- [PATCH v2 12/30] linux-user/cris: Use force_sig_fault, force_sigsegv_code, Richard Henderson, 2021/08/21
- [PATCH v2 15/30] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW, Richard Henderson, 2021/08/21
- [PATCH v2 20/30] linux-user/microblaze: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 21/30] linux-user/microblaze: Fix SIGFPE si_codes,
Richard Henderson <=
- [PATCH v2 26/30] linux-user/riscv: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 25/30] linux-user/ppc: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 28/30] linux-user/sh4: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 29/30] linux-user/sparc: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 16/30] linux-user/hppa: Set FPE_CONDTRAP for COND, Richard Henderson, 2021/08/21