[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/37] bsd-user/x86_64: Move functions into signal.c
From: |
Warner Losh |
Subject: |
[PULL 11/37] bsd-user/x86_64: Move functions into signal.c |
Date: |
Sat, 8 Jan 2022 00:37:11 -0700 |
Move the current inline functions into sigal.c. This will increate the
flexibility of implementation in the future.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/x86_64/signal.c | 56 +++++++++++++++++++++++++++-
bsd-user/x86_64/target_arch_signal.h | 43 ++++-----------------
2 files changed, 63 insertions(+), 36 deletions(-)
diff --git a/bsd-user/x86_64/signal.c b/bsd-user/x86_64/signal.c
index ac903233653..8885152a7da 100644
--- a/bsd-user/x86_64/signal.c
+++ b/bsd-user/x86_64/signal.c
@@ -1 +1,55 @@
-/* Placeholder for signal.c */
+/*
+ * x86_64 signal definitions
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu.h"
+
+/*
+ * Compare to amd64/amd64/machdep.c sendsig()
+ * Assumes that target stack frame memory is locked.
+ */
+abi_long set_sigtramp_args(CPUX86State *regs,
+ int sig, struct target_sigframe *frame, abi_ulong frame_addr,
+ struct target_sigaction *ka)
+{
+ /* XXX return -TARGET_EOPNOTSUPP; */
+ return 0;
+}
+
+/* Compare to amd64/amd64/machdep.c get_mcontext() */
+abi_long get_mcontext(CPUX86State *regs,
+ target_mcontext_t *mcp, int flags)
+{
+ /* XXX */
+ return -TARGET_EOPNOTSUPP;
+}
+
+/* Compare to amd64/amd64/machdep.c set_mcontext() */
+abi_long set_mcontext(CPUX86State *regs,
+ target_mcontext_t *mcp, int srflag)
+{
+ /* XXX */
+ return -TARGET_EOPNOTSUPP;
+}
+
+abi_long get_ucontext_sigreturn(CPUX86State *regs,
+ abi_ulong target_sf, abi_ulong *target_uc)
+{
+ /* XXX */
+ *target_uc = 0;
+ return -TARGET_EOPNOTSUPP;
+}
diff --git a/bsd-user/x86_64/target_arch_signal.h
b/bsd-user/x86_64/target_arch_signal.h
index 720e3939c31..b39b70466ef 100644
--- a/bsd-user/x86_64/target_arch_signal.h
+++ b/bsd-user/x86_64/target_arch_signal.h
@@ -96,40 +96,13 @@ struct target_sigframe {
uint32_t __spare__[2];
};
-/*
- * Compare to amd64/amd64/machdep.c sendsig()
- * Assumes that target stack frame memory is locked.
- */
-static inline abi_long set_sigtramp_args(CPUX86State *regs,
- int sig, struct target_sigframe *frame, abi_ulong frame_addr,
- struct target_sigaction *ka)
-{
- /* XXX return -TARGET_EOPNOTSUPP; */
- return 0;
-}
-
-/* Compare to amd64/amd64/machdep.c get_mcontext() */
-static inline abi_long get_mcontext(CPUX86State *regs,
- target_mcontext_t *mcp, int flags)
-{
- /* XXX */
- return -TARGET_EOPNOTSUPP;
-}
-
-/* Compare to amd64/amd64/machdep.c set_mcontext() */
-static inline abi_long set_mcontext(CPUX86State *regs,
- target_mcontext_t *mcp, int srflag)
-{
- /* XXX */
- return -TARGET_EOPNOTSUPP;
-}
-
-static inline abi_long get_ucontext_sigreturn(CPUX86State *regs,
- abi_ulong target_sf, abi_ulong *target_uc)
-{
- /* XXX */
- *target_uc = 0;
- return -TARGET_EOPNOTSUPP;
-}
+abi_long set_sigtramp_args(CPUX86State *env, int sig,
+ struct target_sigframe *frame,
+ abi_ulong frame_addr,
+ struct target_sigaction *ka);
+abi_long get_mcontext(CPUX86State *regs, target_mcontext_t *mcp, int flags);
+abi_long set_mcontext(CPUX86State *regs, target_mcontext_t *mcp, int srflag);
+abi_long get_ucontext_sigreturn(CPUX86State *regs, abi_ulong target_sf,
+ abi_ulong *target_uc);
#endif /* !TARGET_ARCH_SIGNAL_H_ */
--
2.33.1
- [PULL 00/37] Bsd user arm patches, Warner Losh, 2022/01/08
- [PULL 01/37] bsd-user/mips*: Remove mips support, Warner Losh, 2022/01/08
- [PULL 04/37] bsd-user/i386/target_arch_signal.h: Remove target_sigcontext, Warner Losh, 2022/01/08
- [PULL 06/37] bsd-user/i386/target_arch_signal.h: Update mcontext_t to match FreeBSD, Warner Losh, 2022/01/08
- [PULL 11/37] bsd-user/x86_64: Move functions into signal.c,
Warner Losh <=
- [PULL 19/37] bsd-user/arm/target_arch_cpu.h: Implement trivial EXCP exceptions, Warner Losh, 2022/01/08
- [PULL 25/37] bsd-user/arm/target_arch_thread.h: Routines to create and switch to a thread, Warner Losh, 2022/01/08
- [PULL 26/37] bsd-user/arm/target_arch_elf.h: arm defines for ELF, Warner Losh, 2022/01/08
- [PULL 27/37] bsd-user/arm/target_arch_elf.h: arm get hwcap, Warner Losh, 2022/01/08
- [PULL 05/37] bsd-user/i386/target_arch_signal.h: use new target_os_ucontext.h, Warner Losh, 2022/01/08
- [PULL 12/37] bsd-user/target_os_signal.h: Move signal prototypes to target_os_ucontext.h, Warner Losh, 2022/01/08
- [PULL 02/37] bsd-user/freebsd: Create common target_os_ucontext.h file, Warner Losh, 2022/01/08
- [PULL 07/37] bsd-user/i386: Move the inlines into signal.c, Warner Losh, 2022/01/08
- [PULL 13/37] bsd-user/arm/target_arch_sysarch.h: Use consistent include guards, Warner Losh, 2022/01/08
- [PULL 20/37] bsd-user/arm/target_arch_cpu.h: Implement data abort exceptions, Warner Losh, 2022/01/08