[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/30] linux-user/hexagon: Use force_sigsegv_code
From: |
Richard Henderson |
Subject: |
[PATCH v2 13/30] linux-user/hexagon: Use force_sigsegv_code |
Date: |
Sat, 21 Aug 2021 20:55:20 -0700 |
Use the new function instead of setting up a target_siginfo_t
and calling queue_signal. Note that we were incorrectly using
QEMU_SI_KILL instead of QEMU_SI_FAULT for raising SIGSEGV.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/hexagon/cpu_loop.c | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c
index bc34f5d7c3..6095ca06ca 100644
--- a/linux-user/hexagon/cpu_loop.c
+++ b/linux-user/hexagon/cpu_loop.c
@@ -21,13 +21,13 @@
#include "qemu/osdep.h"
#include "qemu.h"
#include "cpu_loop-common.h"
+#include "signal-common.h"
#include "internal.h"
void cpu_loop(CPUHexagonState *env)
{
CPUState *cs = env_cpu(env);
- int trapnr, signum, sigcode;
- target_ulong sigaddr;
+ int trapnr;
target_ulong syscallnum;
target_ulong ret;
@@ -37,10 +37,6 @@ void cpu_loop(CPUHexagonState *env)
cpu_exec_end(cs);
process_queued_cpu_work(cs);
- signum = 0;
- sigcode = 0;
- sigaddr = 0;
-
switch (trapnr) {
case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */
@@ -66,8 +62,8 @@ void cpu_loop(CPUHexagonState *env)
case HEX_EXCP_FETCH_NO_UPAGE:
case HEX_EXCP_PRIV_NO_UREAD:
case HEX_EXCP_PRIV_NO_UWRITE:
- signum = TARGET_SIGSEGV;
- sigcode = TARGET_SEGV_MAPERR;
+ /* FIXME: need to store vaddr in hexagon_tlb_fill */
+ force_sigsegv_for_addr(0);
break;
case EXCP_ATOMIC:
cpu_exec_step_atomic(cs);
@@ -78,16 +74,6 @@ void cpu_loop(CPUHexagonState *env)
exit(EXIT_FAILURE);
}
- if (signum) {
- target_siginfo_t info = {
- .si_signo = signum,
- .si_errno = 0,
- .si_code = sigcode,
- ._sifields._sigfault._addr = sigaddr
- };
- queue_signal(env, info.si_signo, QEMU_SI_KILL, &info);
- }
-
process_pending_signals(env);
}
}
--
2.25.1
- Re: [PATCH v2 05/30] linux-user: Provide new force_sig_fault() function, (continued)
- [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, 2021/08/21
- [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 <=
- [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
- [PATCH v2 09/30] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap, Richard Henderson, 2021/08/21
- [PATCH v2 10/30] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, Richard Henderson, 2021/08/21