[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/30] linux-user/hppa: Use force_sig_fault, force_sigsegv_for
From: |
Richard Henderson |
Subject: |
[PATCH v2 14/30] linux-user/hppa: Use force_sig_fault, force_sigsegv_for_addr |
Date: |
Sat, 21 Aug 2021 20:55:21 -0700 |
Use the new functions instead of setting up a target_siginfo_t
and calling queue_signal.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/hppa/cpu_loop.c | 32 +++++++-------------------------
1 file changed, 7 insertions(+), 25 deletions(-)
diff --git a/linux-user/hppa/cpu_loop.c b/linux-user/hppa/cpu_loop.c
index 82d8183821..3500b2c291 100644
--- a/linux-user/hppa/cpu_loop.c
+++ b/linux-user/hppa/cpu_loop.c
@@ -20,6 +20,8 @@
#include "qemu/osdep.h"
#include "qemu.h"
#include "cpu_loop-common.h"
+#include "signal-common.h"
+
static abi_ulong hppa_lws(CPUHPPAState *env)
{
@@ -108,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;
@@ -152,42 +153,23 @@ void cpu_loop(CPUHPPAState *env)
case EXCP_PAGE_REF:
case EXCP_DMAR:
case EXCP_DMPI:
- info.si_signo = TARGET_SIGSEGV;
- info.si_errno = 0;
- info.si_code = TARGET_SEGV_ACCERR;
- info._sifields._sigfault._addr = env->cr[CR_IOR];
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sigsegv_for_addr(env->cr[CR_IOR]);
break;
case EXCP_UNALIGN:
- info.si_signo = TARGET_SIGBUS;
- info.si_errno = 0;
- info.si_code = 0;
- info._sifields._sigfault._addr = env->cr[CR_IOR];
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGBUS, TARGET_BUS_ADRALN, env->cr[CR_IOR]);
break;
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 v2 04/30] linux-user: Zero out target_siginfo_t in force_sig(), (continued)
- [PATCH v2 04/30] linux-user: Zero out target_siginfo_t in force_sig(), Richard Henderson, 2021/08/21
- [PATCH v2 02/30] linux-user/arm: Set siginfo_t addr field for SIGTRAP signals, Richard Henderson, 2021/08/21
- [PATCH v2 05/30] linux-user: Provide new force_sig_fault() function, Richard Henderson, 2021/08/21
- [PATCH v2 06/30] linux-user: Provide new force_sigsegv_for_addr() function, Richard Henderson, 2021/08/21
- [PATCH v2 03/30] linux-user/arm: Use force_sig() to deliver fpa11 emulation SIGFPE, Richard Henderson, 2021/08/21
- [PATCH v2 07/30] linux-user/arm: Use force_sig_fault(), Richard Henderson, 2021/08/21
- [PATCH v2 14/30] linux-user/hppa: Use force_sig_fault, force_sigsegv_for_addr,
Richard Henderson <=
- [PATCH v2 24/30] linux-user/openrisc: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 13/30] linux-user/hexagon: Use force_sigsegv_code, Richard Henderson, 2021/08/21
- [PATCH v2 17/30] linux-user/i386: Split out maybe_handle_vm86_trap, Richard Henderson, 2021/08/21
- [PATCH v2 18/30] linux-user/i386: Use force_sig, force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 08/30] linux-user/aarch64: Use force_sig_fault(), Richard Henderson, 2021/08/21