[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/23] linux-user/microblaze: Use force_sig_fault
From: |
Richard Henderson |
Subject: |
[PATCH v3 11/23] linux-user/microblaze: Use force_sig_fault |
Date: |
Wed, 3 Nov 2021 10:08:35 -0400 |
Use the new function instead of setting up a target_siginfo_t
and calling queue_signal. Fill in the missing PC for SIGTRAP.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/microblaze/cpu_loop.c | 61 +++++++++++++-------------------
1 file changed, 25 insertions(+), 36 deletions(-)
diff --git a/linux-user/microblaze/cpu_loop.c b/linux-user/microblaze/cpu_loop.c
index a94467dd2d..263b68aea1 100644
--- a/linux-user/microblaze/cpu_loop.c
+++ b/linux-user/microblaze/cpu_loop.c
@@ -27,9 +27,8 @@
void cpu_loop(CPUMBState *env)
{
CPUState *cs = env_cpu(env);
- int trapnr, ret;
- target_siginfo_t info;
-
+ int trapnr, ret, si_code;
+
while (1) {
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
@@ -38,8 +37,8 @@ void cpu_loop(CPUMBState *env)
switch (trapnr) {
case EXCP_INTERRUPT:
- /* just indicate that signals should be handled asap */
- break;
+ /* just indicate that signals should be handled asap */
+ break;
case EXCP_SYSCALL:
/* Return address is 4 bytes after the call. */
env->regs[14] += 4;
@@ -67,6 +66,7 @@ void cpu_loop(CPUMBState *env)
*/
env->regs[14] = env->pc;
break;
+
case EXCP_HW_EXCP:
env->regs[17] = env->pc + 4;
if (env->iflags & D_FLAG) {
@@ -74,42 +74,31 @@ void cpu_loop(CPUMBState *env)
env->pc -= 4;
/* FIXME: if branch was immed, replay the imm as well. */
}
-
env->iflags &= ~(IMM_FLAG | D_FLAG);
-
switch (env->esr & 31) {
- case ESR_EC_DIVZERO:
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = TARGET_FPE_FLTDIV;
- info._sifields._sigfault._addr = 0;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
- break;
- case ESR_EC_FPU:
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- if (env->fsr & FSR_IO) {
- info.si_code = TARGET_FPE_FLTINV;
- }
- if (env->fsr & FSR_DZ) {
- info.si_code = TARGET_FPE_FLTDIV;
- }
- info._sifields._sigfault._addr = 0;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
- break;
- default:
- fprintf(stderr, "Unhandled hw-exception: 0x%x\n",
- env->esr & ESR_EC_MASK);
- cpu_dump_state(cs, stderr, 0);
- exit(EXIT_FAILURE);
- break;
+ case ESR_EC_DIVZERO:
+ si_code = TARGET_FPE_FLTDIV;
+ break;
+ case ESR_EC_FPU:
+ si_code = 0;
+ if (env->fsr & FSR_IO) {
+ si_code = TARGET_FPE_FLTINV;
+ }
+ if (env->fsr & FSR_DZ) {
+ si_code = TARGET_FPE_FLTDIV;
+ }
+ break;
+ default:
+ fprintf(stderr, "Unhandled hw-exception: 0x%x\n",
+ env->esr & ESR_EC_MASK);
+ cpu_dump_state(cs, stderr, 0);
+ exit(EXIT_FAILURE);
}
+ force_sig_fault(TARGET_SIGFPE, si_code, env->pc);
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);
+ force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc);
break;
case EXCP_ATOMIC:
cpu_exec_step_atomic(cs);
--
2.25.1
- [PATCH v3 04/23] linux-user/cris: Use force_sig_fault, (continued)
- [PATCH v3 04/23] linux-user/cris: Use force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 03/23] linux-user/alpha: Use force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 01/23] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap, Richard Henderson, 2021/11/03
- [PATCH v3 02/23] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, Richard Henderson, 2021/11/03
- [PATCH v3 05/23] linux-user/hppa: Use force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 09/23] linux-user/i386: Use force_sig, force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 06/23] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW, Richard Henderson, 2021/11/03
- [PATCH v3 07/23] linux-user/hppa: Set FPE_CONDTRAP for COND, Richard Henderson, 2021/11/03
- [PATCH v3 08/23] linux-user/i386: Split out maybe_handle_vm86_trap, Richard Henderson, 2021/11/03
- [PATCH v3 10/23] linux-user/m68k: Use force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 11/23] linux-user/microblaze: Use force_sig_fault,
Richard Henderson <=
- [PATCH v3 12/23] linux-user/microblaze: Fix SIGFPE si_codes, Richard Henderson, 2021/11/03
- [PATCH v3 14/23] linux-user/mips: Use force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 13/23] linux-user/mips: Improve do_break, Richard Henderson, 2021/11/03
- [PATCH v3 15/23] target/mips: Extract break code into env->error_code, Richard Henderson, 2021/11/03
- [PATCH v3 16/23] target/mips: Extract trap code into env->error_code, Richard Henderson, 2021/11/03