[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 06/25] linux-user/cris: Use force_sig_fault
From: |
Richard Henderson |
Subject: |
[PATCH v3 06/25] linux-user/cris: Use force_sig_fault |
Date: |
Sat, 18 Sep 2021 18:56:59 -0700 |
Use the new function instead of setting up a target_siginfo_t
and calling queue_signal. Fill in the missing PC for SIGTRAP.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/cris/cpu_loop.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c
index 0de941c0b4..2637c19a46 100644
--- a/linux-user/cris/cpu_loop.c
+++ b/linux-user/cris/cpu_loop.c
@@ -21,13 +21,13 @@
#include "qemu-common.h"
#include "qemu.h"
#include "cpu_loop-common.h"
+#include "signal-common.h"
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);
@@ -36,8 +36,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],
@@ -55,10 +55,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 v3 00/25] linux-user: Clean up siginfo_t handling, Richard Henderson, 2021/09/18
- [PATCH v3 01/25] linux-user/arm: Use force_sig_fault(), Richard Henderson, 2021/09/18
- [PATCH v3 03/25] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap, Richard Henderson, 2021/09/18
- [PATCH v3 04/25] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, Richard Henderson, 2021/09/18
- [PATCH v3 02/25] linux-user/aarch64: Use force_sig_fault(), Richard Henderson, 2021/09/18
- [PATCH v3 05/25] linux-user/alpha: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 06/25] linux-user/cris: Use force_sig_fault,
Richard Henderson <=
- [PATCH v3 10/25] linux-user/i386: Split out maybe_handle_vm86_trap, Richard Henderson, 2021/09/18
- [PATCH v3 07/25] linux-user/hppa: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 08/25] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW, Richard Henderson, 2021/09/18
- [PATCH v3 11/25] linux-user/i386: Use force_sig, force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 14/25] linux-user/microblaze: Fix SIGFPE si_codes, Richard Henderson, 2021/09/18
- [PATCH v3 09/25] linux-user/hppa: Set FPE_CONDTRAP for COND, Richard Henderson, 2021/09/18
- [PATCH v3 17/25] target/mips: Extract break code into env->error_code, Richard Henderson, 2021/09/18
- [PATCH v3 12/25] linux-user/m68k: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 13/25] linux-user/microblaze: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 16/25] linux-user/mips: Use force_sig_fault, Richard Henderson, 2021/09/18