[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/30] linux-user/mips: Use force_sig_fault
From: |
Laurent Vivier |
Subject: |
[PULL 15/30] linux-user/mips: Use force_sig_fault |
Date: |
Tue, 11 Jan 2022 20:52:32 +0100 |
From: Richard Henderson <richard.henderson@linaro.org>
Use the new function instead of setting up a target_siginfo_t
and calling queue_signal. Fill in the missing PC for SIGTRAP
and SIGFPE; use force_sig (SI_KERNEL) for EXCP_DSPDIS.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220107213243.212806-16-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/mips/cpu_loop.c | 38 +++++++++++++-------------------------
1 file changed, 13 insertions(+), 25 deletions(-)
diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
index 4fa24cc07452..1286fbc2e0d3 100644
--- a/linux-user/mips/cpu_loop.c
+++ b/linux-user/mips/cpu_loop.c
@@ -64,8 +64,7 @@ static void do_tr_or_bp(CPUMIPSState *env, unsigned int code,
bool trap)
void cpu_loop(CPUMIPSState *env)
{
CPUState *cs = env_cpu(env);
- target_siginfo_t info;
- int trapnr;
+ int trapnr, si_code;
abi_long ret;
# ifdef TARGET_ABI_MIPSO32
unsigned int syscall_num;
@@ -156,43 +155,32 @@ done_syscall:
break;
case EXCP_CpU:
case EXCP_RI:
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code = 0;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ case EXCP_DSPDIS:
+ force_sig(TARGET_SIGILL);
break;
case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */
break;
case EXCP_DEBUG:
- info.si_signo = TARGET_SIGTRAP;
- info.si_errno = 0;
- info.si_code = TARGET_TRAP_BRKPT;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
- break;
- case EXCP_DSPDIS:
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code = TARGET_ILL_ILLOPC;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT,
+ env->active_tc.PC);
break;
case EXCP_FPE:
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = TARGET_FPE_FLTUNK;
+ si_code = TARGET_FPE_FLTUNK;
if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_INVALID) {
- info.si_code = TARGET_FPE_FLTINV;
+ si_code = TARGET_FPE_FLTINV;
} else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_DIV0) {
- info.si_code = TARGET_FPE_FLTDIV;
+ si_code = TARGET_FPE_FLTDIV;
} else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_OVERFLOW) {
- info.si_code = TARGET_FPE_FLTOVF;
+ si_code = TARGET_FPE_FLTOVF;
} else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_UNDERFLOW) {
- info.si_code = TARGET_FPE_FLTUND;
+ si_code = TARGET_FPE_FLTUND;
} else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_INEXACT) {
- info.si_code = TARGET_FPE_FLTRES;
+ si_code = TARGET_FPE_FLTRES;
}
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGFPE, si_code, env->active_tc.PC);
break;
+
/* The code below was inspired by the MIPS Linux kernel trap
* handling code in arch/mips/kernel/traps.c.
*/
--
2.33.1
- [PULL 18/30] linux-user/openrisc: Use force_sig_fault, (continued)
- [PULL 18/30] linux-user/openrisc: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 24/30] linux-user/xtensa: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 08/30] linux-user/hppa: Set FPE_CONDTRAP for COND, Laurent Vivier, 2022/01/11
- [PULL 27/30] linux-user: Do not special-case NULL for PR_GET_PDEATHSIG, Laurent Vivier, 2022/01/11
- [PULL 14/30] linux-user/mips: Improve do_break, Laurent Vivier, 2022/01/11
- [PULL 30/30] linux-user: Implement capability prctls, Laurent Vivier, 2022/01/11
- [PULL 26/30] linux-user: Move target_struct.h generic definitions to generic/, Laurent Vivier, 2022/01/11
- [PULL 09/30] linux-user/i386: Split out maybe_handle_vm86_trap, Laurent Vivier, 2022/01/11
- [PULL 10/30] linux-user/i386: Use force_sig, force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 11/30] linux-user/m68k: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 15/30] linux-user/mips: Use force_sig_fault,
Laurent Vivier <=
- [PULL 07/30] linux-user: Remove TARGET_NSIGFPE, Laurent Vivier, 2022/01/11
- [PULL 17/30] target/mips: Extract trap code into env->error_code, Laurent Vivier, 2022/01/11
- [PULL 20/30] linux-user/riscv: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 21/30] linux-user/s390x: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 19/30] linux-user/ppc: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 23/30] linux-user/sparc: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 22/30] linux-user/sh4: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 25/30] linux-user/arm: Move target_oabi_flock64 out of target_structs.h, Laurent Vivier, 2022/01/11
- [PULL 29/30] linux-user: Implement PR_SET_PDEATHSIG, Laurent Vivier, 2022/01/11
- [PULL 28/30] linux-user: Map signal number in PR_GET_PDEATHSIG, Laurent Vivier, 2022/01/11