[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/24] linux-user/m68k: Use force_sig_fault
From: |
Richard Henderson |
Subject: |
[PATCH v4 11/24] linux-user/m68k: Use force_sig_fault |
Date: |
Mon, 20 Dec 2021 13:05:15 -0800 |
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/m68k/cpu_loop.c | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
index 790bd558c3..f6ea3b97ec 100644
--- a/linux-user/m68k/cpu_loop.c
+++ b/linux-user/m68k/cpu_loop.c
@@ -29,7 +29,6 @@ void cpu_loop(CPUM68KState *env)
CPUState *cs = env_cpu(env);
int trapnr;
unsigned int n;
- target_siginfo_t info;
for(;;) {
cpu_exec_start(cs);
@@ -46,25 +45,13 @@ void cpu_loop(CPUM68KState *env)
case EXCP_ILLEGAL:
case EXCP_LINEA:
case EXCP_LINEF:
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code = TARGET_ILL_ILLOPN;
- info._sifields._sigfault._addr = env->pc;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, env->pc);
break;
case EXCP_CHK:
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = TARGET_FPE_INTOVF;
- info._sifields._sigfault._addr = env->pc;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTOVF, env->pc);
break;
case EXCP_DIV0:
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = TARGET_FPE_INTDIV;
- info._sifields._sigfault._addr = env->pc;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTDIV, env->pc);
break;
case EXCP_TRAP0:
{
@@ -91,10 +78,7 @@ void cpu_loop(CPUM68KState *env)
/* 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);
+ force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc);
break;
case EXCP_ATOMIC:
cpu_exec_step_atomic(cs);
--
2.25.1
- [PATCH v4 02/24] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, (continued)
- [PATCH v4 02/24] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, Richard Henderson, 2021/12/20
- [PATCH v4 01/24] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap, Richard Henderson, 2021/12/20
- [PATCH v4 03/24] linux-user/alpha: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 04/24] linux-user/cris: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 06/24] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW, Richard Henderson, 2021/12/20
- [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 <=
- [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, 2021/12/20
- [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