[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 11/60] linux-user/host/arm: Populate host_signal.h
From: |
Richard Henderson |
Subject: |
[PATCH v7 11/60] linux-user/host/arm: Populate host_signal.h |
Date: |
Mon, 1 Nov 2021 13:26:40 -0400 |
Split host_signal_pc and host_signal_write out of user-exec.c.
Drop the *BSD code, to be re-created under bsd-user/ later.
Cc: Thomas Huth <thuth@redhat.com>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/host/arm/host-signal.h | 31 ++++++++++++++++++++-
accel/tcg/user-exec.c | 45 +------------------------------
2 files changed, 31 insertions(+), 45 deletions(-)
diff --git a/linux-user/host/arm/host-signal.h
b/linux-user/host/arm/host-signal.h
index f4b4d65031..efb165c0c5 100644
--- a/linux-user/host/arm/host-signal.h
+++ b/linux-user/host/arm/host-signal.h
@@ -1 +1,30 @@
-#define HOST_SIGNAL_PLACEHOLDER
+/*
+ * host-signal.h: signal info dependent on the host architecture
+ *
+ * Copyright (c) 2003-2005 Fabrice Bellard
+ * Copyright (c) 2021 Linaro Limited
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef ARM_HOST_SIGNAL_H
+#define ARM_HOST_SIGNAL_H
+
+static inline uintptr_t host_signal_pc(ucontext_t *uc)
+{
+ return uc->uc_mcontext.arm_pc;
+}
+
+static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
+{
+ /*
+ * In the FSR, bit 11 is WnR, assuming a v6 or
+ * later processor. On v5 we will always report
+ * this as a read, which will fail later.
+ */
+ uint32_t fsr = uc->uc_mcontext.error_code;
+ return extract32(fsr, 11, 1);
+}
+
+#endif
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 694eff7f04..fabc8855a9 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -253,50 +253,7 @@ void *probe_access(CPUArchState *env, target_ulong addr,
int size,
return size ? g2h(env_cpu(env), addr) : NULL;
}
-#if defined(__arm__)
-
-#if defined(__NetBSD__)
-#include <ucontext.h>
-#include <sys/siginfo.h>
-#endif
-
-int cpu_signal_handler(int host_signum, void *pinfo,
- void *puc)
-{
- siginfo_t *info = pinfo;
-#if defined(__NetBSD__)
- ucontext_t *uc = puc;
- siginfo_t *si = pinfo;
-#else
- ucontext_t *uc = puc;
-#endif
- unsigned long pc;
- uint32_t fsr;
- int is_write;
-
-#if defined(__NetBSD__)
- pc = uc->uc_mcontext.__gregs[_REG_R15];
-#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 &&
__GLIBC_MINOR__ <= 3))
- pc = uc->uc_mcontext.gregs[R15];
-#else
- pc = uc->uc_mcontext.arm_pc;
-#endif
-
-#ifdef __NetBSD__
- fsr = si->si_trap;
-#else
- fsr = uc->uc_mcontext.error_code;
-#endif
- /*
- * In the FSR, bit 11 is WnR, assuming a v6 or
- * later processor. On v5 we will always report
- * this as a read, which will fail later.
- */
- is_write = extract32(fsr, 11, 1);
- return handle_cpu_signal(pc, info, is_write, &uc->uc_sigmask);
-}
-
-#elif defined(__aarch64__)
+#if defined(__aarch64__)
#if defined(__NetBSD__)
--
2.25.1
- [PATCH v7 00/60] user-only: Cleanup SIGSEGV and SIGBUS handling, Richard Henderson, 2021/11/01
- [PATCH v7 01/60] accel/tcg: Split out adjust_signal_pc, Richard Henderson, 2021/11/01
- [PATCH v7 04/60] accel/tcg: Fold cpu_exit_tb_from_sighandler into caller, Richard Henderson, 2021/11/01
- [PATCH v7 12/60] linux-user/host/aarch64: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 03/60] accel/tcg: Split out handle_sigsegv_accerr_write, Richard Henderson, 2021/11/01
- [PATCH v7 06/60] linux-user: Reorg handling for SIGSEGV, Richard Henderson, 2021/11/01
- [PATCH v7 05/60] configure: Merge riscv32 and riscv64 host architectures, Richard Henderson, 2021/11/01
- [PATCH v7 07/60] linux-user/host/x86: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 02/60] accel/tcg: Move clear_helper_retaddr to cpu loop, Richard Henderson, 2021/11/01
- [PATCH v7 11/60] linux-user/host/arm: Populate host_signal.h,
Richard Henderson <=
- [PATCH v7 10/60] linux-user/host/sparc: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 14/60] linux-user/host/mips: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 18/60] linux-user/signal: Drop HOST_SIGNAL_PLACEHOLDER, Richard Henderson, 2021/11/01
- [PATCH v7 08/60] linux-user/host/ppc: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 13/60] linux-user/host/s390: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 16/60] target/arm: Fixup comment re handle_cpu_signal, Richard Henderson, 2021/11/01
- [PATCH v7 21/60] target/alpha: Implement alpha_cpu_record_sigsegv, Richard Henderson, 2021/11/01
- [PATCH v7 34/60] target/ppc: Implement ppc_cpu_record_sigsegv, Richard Henderson, 2021/11/01
- [PATCH v7 17/60] linux-user/host/riscv: Improve host_signal_write, Richard Henderson, 2021/11/01