From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, laurent@vivier.eu
Subject: [PATCH v3 14/23] linux-user/mips: Use force_sig_fault
Date: Wed, 3 Nov 2021 10:08:38 -0400 [thread overview]
Message-ID: <20211103140847.454070-15-richard.henderson@linaro.org> (raw)
In-Reply-To: <20211103140847.454070-1-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
and SIGFPE; use force_sig (SI_KERNEL) for EXCP_DSPDIS.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/mips/cpu_loop.c | 38 +++++++++++++-------------------------
1 file changed, 13 insertions(+), 25 deletions(-)
diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
index 7317194cc3..034b31f853 100644
--- a/linux-user/mips/cpu_loop.c
+++ b/linux-user/mips/cpu_loop.c
@@ -64,8 +64,7 @@ static void do_tr_or_bp(CPUMIPSState *env, unsigned int code, bool trap)
void cpu_loop(CPUMIPSState *env)
{
CPUState *cs = env_cpu(env);
- target_siginfo_t info;
- int trapnr;
+ int trapnr, si_code;
abi_long ret;
# ifdef TARGET_ABI_MIPSO32
unsigned int syscall_num;
@@ -156,43 +155,32 @@ done_syscall:
break;
case EXCP_CpU:
case EXCP_RI:
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code = 0;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ case EXCP_DSPDIS:
+ force_sig(TARGET_SIGILL);
break;
case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */
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);
- break;
- case EXCP_DSPDIS:
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code = TARGET_ILL_ILLOPC;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT,
+ env->active_tc.PC);
break;
case EXCP_FPE:
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = TARGET_FPE_FLTUNK;
+ si_code = TARGET_FPE_FLTUNK;
if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_INVALID) {
- info.si_code = TARGET_FPE_FLTINV;
+ si_code = TARGET_FPE_FLTINV;
} else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_DIV0) {
- info.si_code = TARGET_FPE_FLTDIV;
+ si_code = TARGET_FPE_FLTDIV;
} else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_OVERFLOW) {
- info.si_code = TARGET_FPE_FLTOVF;
+ si_code = TARGET_FPE_FLTOVF;
} else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_UNDERFLOW) {
- info.si_code = TARGET_FPE_FLTUND;
+ si_code = TARGET_FPE_FLTUND;
} else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_INEXACT) {
- info.si_code = TARGET_FPE_FLTRES;
+ si_code = TARGET_FPE_FLTRES;
}
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGFPE, si_code, env->active_tc.PC);
break;
+
/* The code below was inspired by the MIPS Linux kernel trap
* handling code in arch/mips/kernel/traps.c.
*/
--
2.25.1
next prev parent reply other threads:[~2021-11-03 14:27 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 14:08 [PATCH v3 00/23] linux-user: Clean up siginfo_t handling Richard Henderson
2021-11-03 14:08 ` [PATCH v3 01/23] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap Richard Henderson
2021-11-03 14:08 ` [PATCH v3 02/23] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND Richard Henderson
2021-11-03 14:08 ` [PATCH v3 03/23] linux-user/alpha: Use force_sig_fault Richard Henderson
2021-11-03 14:08 ` [PATCH v3 04/23] linux-user/cris: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 05/23] linux-user/hppa: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 06/23] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW Richard Henderson
2021-11-03 14:08 ` [PATCH v3 07/23] linux-user/hppa: Set FPE_CONDTRAP for COND Richard Henderson
2021-11-03 14:08 ` [PATCH v3 08/23] linux-user/i386: Split out maybe_handle_vm86_trap Richard Henderson
2021-11-03 14:08 ` [PATCH v3 09/23] linux-user/i386: Use force_sig, force_sig_fault Richard Henderson
2021-11-03 14:08 ` [PATCH v3 10/23] linux-user/m68k: Use force_sig_fault Richard Henderson
2021-11-03 14:08 ` [PATCH v3 11/23] linux-user/microblaze: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 12/23] linux-user/microblaze: Fix SIGFPE si_codes Richard Henderson
2021-11-03 14:08 ` [PATCH v3 13/23] linux-user/mips: Improve do_break Richard Henderson
2021-11-03 14:08 ` Richard Henderson [this message]
2021-11-03 14:08 ` [PATCH v3 15/23] target/mips: Extract break code into env->error_code Richard Henderson
2021-11-03 15:11 ` Philippe Mathieu-Daudé
2021-11-03 15:38 ` Richard Henderson
2021-11-03 17:01 ` Philippe Mathieu-Daudé
2021-11-03 14:08 ` [PATCH v3 16/23] target/mips: Extract trap " Richard Henderson
2021-11-03 15:21 ` Philippe Mathieu-Daudé
2021-11-03 15:46 ` Richard Henderson
2021-11-03 17:04 ` Philippe Mathieu-Daudé
2021-11-03 14:08 ` [PATCH v3 17/23] linux-user/openrisc: Use force_sig_fault Richard Henderson
2021-11-03 20:35 ` Stafford Horne
2021-11-03 14:08 ` [PATCH v3 18/23] linux-user/ppc: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 19/23] linux-user/riscv: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 20/23] linux-user/s390x: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 21/23] linux-user/sh4: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 22/23] linux-user/sparc: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 23/23] linux-user/xtensa: " Richard Henderson
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=20211103140847.454070-15-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).