[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 29/30] linux-user/sparc: Use force_sig_fault, force_sigsegv_fo
From: |
Richard Henderson |
Subject: |
[PATCH v2 29/30] linux-user/sparc: Use force_sig_fault, force_sigsegv_for_addr |
Date: |
Sat, 21 Aug 2021 20:55:36 -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/sparc/cpu_loop.c | 38 +++++++------------------------------
1 file changed, 7 insertions(+), 31 deletions(-)
diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
index 02532f198d..20fca9f9f3 100644
--- a/linux-user/sparc/cpu_loop.c
+++ b/linux-user/sparc/cpu_loop.c
@@ -21,6 +21,7 @@
#include "qemu-common.h"
#include "qemu.h"
#include "cpu_loop-common.h"
+#include "signal-common.h"
#define SPARC64_STACK_BIAS 2047
@@ -153,7 +154,6 @@ void cpu_loop (CPUSPARCState *env)
CPUState *cs = env_cpu(env);
int trapnr;
abi_long ret;
- target_siginfo_t info;
while (1) {
cpu_exec_start(cs);
@@ -219,14 +219,7 @@ void cpu_loop (CPUSPARCState *env)
break;
case TT_TFAULT:
case TT_DFAULT:
- {
- info.si_signo = TARGET_SIGSEGV;
- info.si_errno = 0;
- /* XXX: check env->error_code */
- info.si_code = TARGET_SEGV_MAPERR;
- info._sifields._sigfault._addr = env->mmuregs[4];
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
- }
+ force_sigsegv_for_addr(env->mmuregs[4]);
break;
#else
case TT_SPILL: /* window overflow */
@@ -236,18 +229,10 @@ void cpu_loop (CPUSPARCState *env)
restore_window(env);
break;
case TT_TFAULT:
+ force_sigsegv_for_addr(cpu_tsptr(env)->tpc);
+ break;
case TT_DFAULT:
- {
- info.si_signo = TARGET_SIGSEGV;
- info.si_errno = 0;
- /* XXX: check env->error_code */
- info.si_code = TARGET_SEGV_MAPERR;
- if (trapnr == TT_DFAULT)
- info._sifields._sigfault._addr = env->dmmu.mmuregs[4];
- else
- info._sifields._sigfault._addr = cpu_tsptr(env)->tpc;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
- }
+ force_sigsegv_for_addr(env->dmmu.mmuregs[4]);
break;
#ifndef TARGET_ABI32
case 0x16e:
@@ -264,19 +249,10 @@ void cpu_loop (CPUSPARCState *env)
/* just indicate that signals should be handled asap */
break;
case TT_ILL_INSN:
- {
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code = TARGET_ILL_ILLOPC;
- info._sifields._sigfault._addr = env->pc;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
- }
+ force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPC, env->pc);
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->pc);
break;
case EXCP_ATOMIC:
cpu_exec_step_atomic(cs);
--
2.25.1
- [PATCH v2 20/30] linux-user/microblaze: Use force_sig_fault, force_sigsegv_for_addr, (continued)
- [PATCH v2 20/30] linux-user/microblaze: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 21/30] linux-user/microblaze: Fix SIGFPE si_codes, Richard Henderson, 2021/08/21
- [PATCH v2 26/30] linux-user/riscv: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 25/30] linux-user/ppc: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 28/30] linux-user/sh4: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 29/30] linux-user/sparc: Use force_sig_fault, force_sigsegv_for_addr,
Richard Henderson <=
- [PATCH v2 16/30] linux-user/hppa: Set FPE_CONDTRAP for COND, Richard Henderson, 2021/08/21
- [PATCH v2 22/30] linux-user/mips: Improve do_break, Richard Henderson, 2021/08/21
- [PATCH v2 19/30] linux-user/m68k: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 30/30] linux-user/xtensa: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 23/30] linux-user/mips: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21