[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/30] linux-user/xtensa: Use force_sig_fault
From: |
Laurent Vivier |
Subject: |
[PULL 24/30] linux-user/xtensa: Use force_sig_fault |
Date: |
Tue, 11 Jan 2022 20:52:41 +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.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220107213243.212806-25-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/xtensa/cpu_loop.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/linux-user/xtensa/cpu_loop.c b/linux-user/xtensa/cpu_loop.c
index 6bc6d6dee6c4..d51ce053926d 100644
--- a/linux-user/xtensa/cpu_loop.c
+++ b/linux-user/xtensa/cpu_loop.c
@@ -126,7 +126,6 @@ static void xtensa_underflow12(CPUXtensaState *env)
void cpu_loop(CPUXtensaState *env)
{
CPUState *cs = env_cpu(env);
- target_siginfo_t info;
abi_ulong ret;
int trapnr;
@@ -163,14 +162,12 @@ void cpu_loop(CPUXtensaState *env)
case EXC_USER:
switch (env->sregs[EXCCAUSE]) {
case ILLEGAL_INSTRUCTION_CAUSE:
+ force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPC,
+ env->sregs[EPC1]);
+ break;
case PRIVILEGED_CAUSE:
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code =
- env->sregs[EXCCAUSE] == ILLEGAL_INSTRUCTION_CAUSE ?
- TARGET_ILL_ILLOPC : TARGET_ILL_PRVOPC;
- info._sifields._sigfault._addr = env->sregs[EPC1];
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGILL, TARGET_ILL_PRVOPC,
+ env->sregs[EPC1]);
break;
case SYSCALL_CAUSE:
@@ -219,11 +216,8 @@ void cpu_loop(CPUXtensaState *env)
break;
case INTEGER_DIVIDE_BY_ZERO_CAUSE:
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = TARGET_FPE_INTDIV;
- info._sifields._sigfault._addr = env->sregs[EPC1];
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTDIV,
+ env->sregs[EPC1]);
break;
default:
@@ -232,10 +226,8 @@ void cpu_loop(CPUXtensaState *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->sregs[EPC1]);
break;
case EXC_DEBUG:
default:
--
2.33.1
- [PULL 00/30] Linux user for 7.0 patches, Laurent Vivier, 2022/01/11
- [PULL 03/30] linux-user/alpha: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 02/30] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, Laurent Vivier, 2022/01/11
- [PULL 12/30] linux-user/microblaze: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 13/30] linux-user/microblaze: Fix SIGFPE si_codes, Laurent Vivier, 2022/01/11
- [PULL 01/30] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap, Laurent Vivier, 2022/01/11
- [PULL 04/30] linux-user/cris: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [PULL 06/30] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW, Laurent Vivier, 2022/01/11
- [PULL 05/30] linux-user/hppa: Use force_sig_fault, Laurent Vivier, 2022/01/11
- [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 <=
- [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, 2022/01/11
- [PULL 07/30] linux-user: Remove TARGET_NSIGFPE, Laurent Vivier, 2022/01/11