[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/24] linux-user/cris: Use force_sig_fault
From: |
Richard Henderson |
Subject: |
[PATCH v4 04/24] linux-user/cris: Use force_sig_fault |
Date: |
Mon, 20 Dec 2021 13:05:08 -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/cris/cpu_loop.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c
index 0d5d268609..16a2e889e5 100644
--- a/linux-user/cris/cpu_loop.c
+++ b/linux-user/cris/cpu_loop.c
@@ -28,8 +28,7 @@ void cpu_loop(CPUCRISState *env)
{
CPUState *cs = env_cpu(env);
int trapnr, ret;
- target_siginfo_t info;
-
+
while (1) {
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
@@ -38,8 +37,8 @@ void cpu_loop(CPUCRISState *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_BREAK:
ret = do_syscall(env,
env->regs[9],
@@ -57,10 +56,7 @@ void cpu_loop(CPUCRISState *env)
}
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 00/24] linux-user: Clean up siginfo_t handling, Richard Henderson, 2021/12/20
- [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 <=
- [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, 2021/12/20
- [PATCH v4 12/24] linux-user/microblaze: Use force_sig_fault, Richard Henderson, 2021/12/20