[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/25] linux-user/i386: Use force_sig, force_sig_fault
From: |
Richard Henderson |
Subject: |
[PATCH v3 11/25] linux-user/i386: Use force_sig, force_sig_fault |
Date: |
Sat, 18 Sep 2021 18:57:04 -0700 |
Replace the local gen_signal with the generic functions that match
how the kernel raises signals. Fill in the missing PC for SIGTRAP.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/i386/cpu_loop.c | 48 +++++++++++++++-----------------------
1 file changed, 19 insertions(+), 29 deletions(-)
diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
index 5866e98441..cd6c2b032d 100644
--- a/linux-user/i386/cpu_loop.c
+++ b/linux-user/i386/cpu_loop.c
@@ -21,6 +21,7 @@
#include "qemu-common.h"
#include "qemu.h"
#include "cpu_loop-common.h"
+#include "signal-common.h"
/***********************************************************/
/* CPUX86 core interface */
@@ -81,17 +82,6 @@ static void set_idt(int n, unsigned int dpl)
}
#endif
-static void gen_signal(CPUX86State *env, int sig, int code, abi_ptr addr)
-{
- target_siginfo_t info = {
- .si_signo = sig,
- .si_code = code,
- ._sifields._sigfault._addr = addr
- };
-
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
-}
-
#ifdef TARGET_X86_64
static bool write_ok_or_segv(CPUX86State *env, abi_ptr addr, size_t len)
{
@@ -104,7 +94,7 @@ static bool write_ok_or_segv(CPUX86State *env, abi_ptr addr,
size_t len)
}
env->error_code = PG_ERROR_W_MASK | PG_ERROR_U_MASK;
- gen_signal(env, TARGET_SIGSEGV, TARGET_SEGV_MAPERR, addr);
+ force_sig_fault(TARGET_SIGSEGV, TARGET_SEGV_MAPERR, addr);
return false;
}
@@ -190,8 +180,7 @@ static void emulate_vsyscall(CPUX86State *env)
return;
sigsegv:
- /* Like force_sig(SIGSEGV). */
- gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0);
+ force_sig(TARGET_SIGSEGV);
}
#endif
@@ -263,53 +252,54 @@ void cpu_loop(CPUX86State *env)
#endif
case EXCP0B_NOSEG:
case EXCP0C_STACK:
- gen_signal(env, TARGET_SIGBUS, TARGET_SI_KERNEL, 0);
+ force_sig(TARGET_SIGBUS);
break;
case EXCP0D_GPF:
/* XXX: potential problem if ABI32 */
if (maybe_handle_vm86_trap(env, trapnr)) {
break;
}
- gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0);
+ force_sig(TARGET_SIGSEGV);
break;
case EXCP0E_PAGE:
- gen_signal(env, TARGET_SIGSEGV,
- (env->error_code & 1 ?
- TARGET_SEGV_ACCERR : TARGET_SEGV_MAPERR),
- env->cr[2]);
+ force_sig_fault(TARGET_SIGSEGV,
+ (env->error_code & PG_ERROR_P_MASK ?
+ TARGET_SEGV_ACCERR : TARGET_SEGV_MAPERR),
+ env->cr[2]);
break;
case EXCP00_DIVZ:
if (maybe_handle_vm86_trap(env, trapnr)) {
break;
}
- gen_signal(env, TARGET_SIGFPE, TARGET_FPE_INTDIV, env->eip);
+ force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTDIV, env->eip);
break;
case EXCP01_DB:
+ if (maybe_handle_vm86_trap(env, trapnr)) {
+ break;
+ }
+ force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->eip);
+ break;
case EXCP03_INT3:
if (maybe_handle_vm86_trap(env, trapnr)) {
break;
}
- if (trapnr == EXCP01_DB) {
- gen_signal(env, TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->eip);
- } else {
- gen_signal(env, TARGET_SIGTRAP, TARGET_SI_KERNEL, 0);
- }
+ force_sig(TARGET_SIGTRAP);
break;
case EXCP04_INTO:
case EXCP05_BOUND:
if (maybe_handle_vm86_trap(env, trapnr)) {
break;
}
- gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0);
+ force_sig(TARGET_SIGSEGV);
break;
case EXCP06_ILLOP:
- gen_signal(env, TARGET_SIGILL, TARGET_ILL_ILLOPN, env->eip);
+ force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, env->eip);
break;
case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */
break;
case EXCP_DEBUG:
- gen_signal(env, TARGET_SIGTRAP, TARGET_TRAP_BRKPT, 0);
+ force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->eip);
break;
case EXCP_ATOMIC:
cpu_exec_step_atomic(cs);
--
2.25.1
- [PATCH v3 00/25] linux-user: Clean up siginfo_t handling, Richard Henderson, 2021/09/18
- [PATCH v3 01/25] linux-user/arm: Use force_sig_fault(), Richard Henderson, 2021/09/18
- [PATCH v3 03/25] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap, Richard Henderson, 2021/09/18
- [PATCH v3 04/25] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, Richard Henderson, 2021/09/18
- [PATCH v3 02/25] linux-user/aarch64: Use force_sig_fault(), Richard Henderson, 2021/09/18
- [PATCH v3 05/25] linux-user/alpha: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 06/25] linux-user/cris: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 10/25] linux-user/i386: Split out maybe_handle_vm86_trap, Richard Henderson, 2021/09/18
- [PATCH v3 07/25] linux-user/hppa: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 08/25] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW, Richard Henderson, 2021/09/18
- [PATCH v3 11/25] linux-user/i386: Use force_sig, force_sig_fault,
Richard Henderson <=
- [PATCH v3 14/25] linux-user/microblaze: Fix SIGFPE si_codes, Richard Henderson, 2021/09/18
- [PATCH v3 09/25] linux-user/hppa: Set FPE_CONDTRAP for COND, Richard Henderson, 2021/09/18
- [PATCH v3 17/25] target/mips: Extract break code into env->error_code, Richard Henderson, 2021/09/18
- [PATCH v3 12/25] linux-user/m68k: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 13/25] linux-user/microblaze: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 16/25] linux-user/mips: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 22/25] linux-user/s390x: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 24/25] linux-user/sparc: Use force_sig_fault, Richard Henderson, 2021/09/18
- [PATCH v3 15/25] linux-user/mips: Improve do_break, Richard Henderson, 2021/09/18
- [PATCH v3 19/25] linux-user/openrisc: Use force_sig_fault, Richard Henderson, 2021/09/18