[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 05/24] linux-user/hppa: Use force_sig_fault
From: |
Richard Henderson |
Subject: |
[PATCH v4 05/24] linux-user/hppa: Use force_sig_fault |
Date: |
Mon, 20 Dec 2021 13:05:09 -0800 |
Use the new function instead of setting up a target_siginfo_t
and calling queue_signal. Fill in the missing PC for SIGTRAP
and missing si_code for SIGBUS.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/hppa/cpu_loop.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/linux-user/hppa/cpu_loop.c b/linux-user/hppa/cpu_loop.c
index 375576c8f0..b09caa1111 100644
--- a/linux-user/hppa/cpu_loop.c
+++ b/linux-user/hppa/cpu_loop.c
@@ -110,7 +110,6 @@ static abi_ulong hppa_lws(CPUHPPAState *env)
void cpu_loop(CPUHPPAState *env)
{
CPUState *cs = env_cpu(env);
- target_siginfo_t info;
abi_ulong ret;
int trapnr;
@@ -147,26 +146,15 @@ void cpu_loop(CPUHPPAState *env)
case EXCP_ILL:
case EXCP_PRIV_OPR:
case EXCP_PRIV_REG:
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code = TARGET_ILL_ILLOPN;
- info._sifields._sigfault._addr = env->iaoq_f;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, env->iaoq_f);
break;
case EXCP_OVERFLOW:
case EXCP_COND:
case EXCP_ASSIST:
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = 0;
- info._sifields._sigfault._addr = env->iaoq_f;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGFPE, 0, env->iaoq_f);
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->iaoq_f);
break;
case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */
--
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, 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 <=
- [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
- [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