[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/41] accel/tcg: Fold cpu_exit_tb_from_sighandler into caller
From: |
Richard Henderson |
Subject: |
[PATCH v2 04/41] accel/tcg: Fold cpu_exit_tb_from_sighandler into caller |
Date: |
Sat, 18 Sep 2021 11:44:50 -0700 |
Remove the comment about siglongjmp. We do use sigsetjmp
in the main cpu loop, but we do not save the signal mask
as most exits from the cpu loop do not require them.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/user-exec.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 6f4fc01b60..de4565f13e 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -46,17 +46,6 @@ __thread uintptr_t helper_retaddr;
//#define DEBUG_SIGNAL
-/* exit the current TB from a signal handler. The host registers are
- restored in a state compatible with the CPU emulator
- */
-static void QEMU_NORETURN cpu_exit_tb_from_sighandler(CPUState *cpu,
- sigset_t *old_set)
-{
- /* XXX: use siglongjmp ? */
- sigprocmask(SIG_SETMASK, old_set, NULL);
- cpu_loop_exit_noexc(cpu);
-}
-
/*
* Adjust the pc to pass to cpu_restore_state; return the memop type.
*/
@@ -155,7 +144,8 @@ bool handle_sigsegv_accerr_write(CPUState *cpu, sigset_t
*old_set,
* currently executing TB was modified and must be exited
* immediately. Clear helper_retaddr for next execution.
*/
- cpu_exit_tb_from_sighandler(cpu, old_set);
+ sigprocmask(SIG_SETMASK, old_set, NULL);
+ cpu_loop_exit_noexc(cpu);
/* NORETURN */
default:
g_assert_not_reached();
--
2.25.1
- [PATCH v2 00/41] linux-user: Streamline handling of SIGSEGV, Richard Henderson, 2021/09/18
- [PATCH v2 01/41] accel/tcg: Split out adjust_signal_pc, Richard Henderson, 2021/09/18
- [PATCH v2 03/41] accel/tcg: Split out handle_sigsegv_accerr_write, Richard Henderson, 2021/09/18
- [PATCH v2 02/41] accel/tcg: Move clear_helper_retaddr to cpu loop, Richard Henderson, 2021/09/18
- [PATCH v2 05/41] configure: Merge riscv32 and riscv64 host architectures, Richard Henderson, 2021/09/18
- [PATCH v2 04/41] accel/tcg: Fold cpu_exit_tb_from_sighandler into caller,
Richard Henderson <=
- [PATCH v2 08/41] linux-user/host/ppc: Populate host_signal.h, Richard Henderson, 2021/09/18
- [PATCH v2 06/41] linux-user: Reorg handling for SIGSEGV, Richard Henderson, 2021/09/18
- [PATCH v2 10/41] linux-user/host/sparc: Populate host_signal.h, Richard Henderson, 2021/09/18
- [PATCH v2 07/41] linux-user/host/x86: Populate host_signal.h, Richard Henderson, 2021/09/18
- [PATCH v2 09/41] linux-user/host/alpha: Populate host_signal.h, Richard Henderson, 2021/09/18