From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, laurent@vivier.eu
Subject: [PATCH v2 13/30] linux-user/hexagon: Use force_sigsegv_code
Date: Sat, 21 Aug 2021 20:55:20 -0700 [thread overview]
Message-ID: <20210822035537.283193-14-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210822035537.283193-1-richard.henderson@linaro.org>
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
next prev parent reply other threads:[~2021-08-22 4:06 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-22 3:55 [PATCH v2 00/30] linux-user: Clean up siginfo_t handling Richard Henderson
2021-08-22 3:55 ` [PATCH v2 01/30] linux-user/aarch64: Set siginfo_t addr field for SIGTRAP signals Richard Henderson
2021-08-22 3:55 ` [PATCH v2 02/30] linux-user/arm: " Richard Henderson
2021-08-22 3:55 ` [PATCH v2 03/30] linux-user/arm: Use force_sig() to deliver fpa11 emulation SIGFPE Richard Henderson
2021-08-22 3:55 ` [PATCH v2 04/30] linux-user: Zero out target_siginfo_t in force_sig() Richard Henderson
2021-08-24 16:32 ` Philippe Mathieu-Daudé
2021-08-22 3:55 ` [PATCH v2 05/30] linux-user: Provide new force_sig_fault() function Richard Henderson
2021-08-24 16:36 ` Philippe Mathieu-Daudé
2021-08-22 3:55 ` [PATCH v2 06/30] linux-user: Provide new force_sigsegv_for_addr() function Richard Henderson
2021-08-24 16:20 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 07/30] linux-user/arm: Use force_sig_fault() Richard Henderson
2021-08-24 16:38 ` Philippe Mathieu-Daudé
2021-08-22 3:55 ` [PATCH v2 08/30] linux-user/aarch64: " Richard Henderson
2021-08-24 16:39 ` Philippe Mathieu-Daudé
2021-08-22 3:55 ` [PATCH v2 09/30] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap Richard Henderson
2021-08-24 16:22 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 10/30] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND Richard Henderson
2021-08-24 16:22 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 11/30] linux-user/alpha: Use force_sig_fault, force_sigsegv_code Richard Henderson
2021-08-24 16:24 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 12/30] linux-user/cris: " Richard Henderson
2021-08-24 16:27 ` Peter Maydell
2021-08-22 3:55 ` Richard Henderson [this message]
2021-08-24 16:29 ` [PATCH v2 13/30] linux-user/hexagon: Use force_sigsegv_code Peter Maydell
2021-08-22 3:55 ` [PATCH v2 14/30] linux-user/hppa: Use force_sig_fault, force_sigsegv_for_addr Richard Henderson
2021-08-24 16:32 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 15/30] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW Richard Henderson
2021-08-24 16:34 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 16/30] linux-user/hppa: Set FPE_CONDTRAP for COND Richard Henderson
2021-08-24 16:37 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 17/30] linux-user/i386: Split out maybe_handle_vm86_trap Richard Henderson
2021-08-24 16:38 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 18/30] linux-user/i386: Use force_sig, force_sig_fault, force_sigsegv_for_addr Richard Henderson
2021-08-24 16:40 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 19/30] linux-user/m68k: Use " Richard Henderson
2021-08-24 16:41 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 20/30] linux-user/microblaze: " Richard Henderson
2021-08-24 16:42 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 21/30] linux-user/microblaze: Fix SIGFPE si_codes Richard Henderson
2021-08-24 16:55 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 22/30] linux-user/mips: Improve do_break Richard Henderson
2021-08-24 16:46 ` Philippe Mathieu-Daudé
2021-08-22 3:55 ` [PATCH v2 23/30] linux-user/mips: Use force_sig_fault, force_sigsegv_for_addr Richard Henderson
2021-08-24 17:04 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 24/30] linux-user/openrisc: " Richard Henderson
2021-08-24 17:17 ` Peter Maydell
2021-09-19 17:49 ` Richard Henderson
2021-09-21 20:26 ` Stafford Horne
2021-08-22 3:55 ` [PATCH v2 25/30] linux-user/ppc: " Richard Henderson
2021-08-24 17:19 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 26/30] linux-user/riscv: " Richard Henderson
2021-08-24 17:23 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 27/30] linux-user/s390x: " Richard Henderson
2021-08-24 17:23 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 28/30] linux-user/sh4: " Richard Henderson
2021-08-24 17:24 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 29/30] linux-user/sparc: " Richard Henderson
2021-08-24 17:25 ` Peter Maydell
2021-08-22 3:55 ` [PATCH v2 30/30] linux-user/xtensa: " Richard Henderson
2021-08-24 17:26 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210822035537.283193-14-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=laurent@vivier.eu \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).