From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Kyle Evans <kevans@freebsd.org>,
Michael Tokarev <mjt@tls.msk.ru>,
Laurent Vivier <laurent@vivier.eu>,
Philippe Mathieu-Daude <f4bug@amsat.org>,
Richard Henderson <richard.henderson@linaro.org>,
Warner Losh <imp@bsdimp.com>
Subject: [PATCH v3 17/29] bsd-user/freebsd: Create common target_os_ucontext.h file
Date: Thu, 4 Nov 2021 08:05:24 -0600 [thread overview]
Message-ID: <20211104140536.42573-18-imp@bsdimp.com> (raw)
In-Reply-To: <20211104140536.42573-1-imp@bsdimp.com>
FreeBSD has a MI ucontext structure that contains the MD mcontext
machine state and other things that are machine independent. Create an
include file for all the ucontext stuff. It needs to be included in the
arch specific files after target_mcontext is defined. This is largely
copied from sys/_ucontext.h with the comments about layout removed
because we don't support ancient FreeBSD binaries.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/freebsd/target_os_signal.h | 3 ---
bsd-user/freebsd/target_os_ucontext.h | 26 ++++++++++++++++++++++++++
2 files changed, 26 insertions(+), 3 deletions(-)
create mode 100644 bsd-user/freebsd/target_os_ucontext.h
diff --git a/bsd-user/freebsd/target_os_signal.h b/bsd-user/freebsd/target_os_signal.h
index 1a4c5faf19..3ed454e086 100644
--- a/bsd-user/freebsd/target_os_signal.h
+++ b/bsd-user/freebsd/target_os_signal.h
@@ -1,9 +1,6 @@
#ifndef _TARGET_OS_SIGNAL_H_
#define _TARGET_OS_SIGNAL_H_
-/* FreeBSD's sys/ucontext.h defines this */
-#define TARGET_MC_GET_CLEAR_RET 0x0001
-
#include "target_os_siginfo.h"
#include "target_arch_signal.h"
diff --git a/bsd-user/freebsd/target_os_ucontext.h b/bsd-user/freebsd/target_os_ucontext.h
new file mode 100644
index 0000000000..20b8a9188e
--- /dev/null
+++ b/bsd-user/freebsd/target_os_ucontext.h
@@ -0,0 +1,26 @@
+/*
+ * FreeBSD has a common ucontext definition for all architectures.
+ *
+ * Copyright 2021 Warner Losh <imp@bsdimp.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+ */
+
+/*
+ * Defines the common bits for all of FreeBSD's architectures. Has to be
+ * included AFTER the MD target_mcontext_t is defined, however, so can't
+ * be in the grab-bag that is target_os_signal.h.
+ */
+
+/* See FreeBSD's sys/ucontext.h */
+#define TARGET_MC_GET_CLEAR_RET 0x0001
+
+/* FreeBSD's sys/_ucontext.h structures */
+typedef struct target_ucontext {
+ target_sigset_t uc_sigmask;
+ target_mcontext_t uc_mcontext;
+ abi_ulong uc_link;
+ target_stack_t uc_stack;
+ int32_t uc_flags;
+ int32_t __spare__[4];
+} target_ucontext_t;
--
2.33.0
next prev parent reply other threads:[~2021-11-04 14:24 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-04 14:05 [PATCH v3 00/29] bsd-user: arm (32-bit) support Warner Losh
2021-11-04 14:05 ` [PATCH v3 01/29] bsd-user/arm/target_arch_sysarch.h: Use consistent include guards Warner Losh
2021-11-04 14:05 ` [PATCH v3 02/29] bsd-user/arm/target_syscall.h: Add copyright and update name Warner Losh
2021-11-04 14:05 ` [PATCH v3 03/29] bsd-user/arm/target_arch_cpu.c: Target specific TLS routines Warner Losh
2021-11-04 14:05 ` [PATCH v3 04/29] bsd-user/arm/target_arch_cpu.h: CPU Loop definitions Warner Losh
2021-11-04 14:05 ` [PATCH v3 05/29] bsd-user/arm/target_arch_cpu.h: Implement target_cpu_clone_regs Warner Losh
2021-11-04 14:05 ` [PATCH v3 06/29] bsd-user/arm/target_arch_cpu.h: Dummy target_cpu_loop implementation Warner Losh
2021-11-04 14:05 ` [PATCH v3 07/29] bsd-user/arm/target_arch_cpu.h: Implement trivial EXCP exceptions Warner Losh
2021-11-04 17:44 ` Richard Henderson
2021-11-04 14:05 ` [PATCH v3 08/29] bsd-user/arm/target_arch_cpu.h: Implement data abort exceptions Warner Losh
2021-11-04 14:05 ` [PATCH v3 09/29] bsd-user/arm/target_arch_cpu.h: Implement system call dispatch Warner Losh
2021-11-04 14:05 ` [PATCH v3 10/29] bsd-user/arm/target_arch_reg.h: Implement core dump register copying Warner Losh
2021-11-04 14:05 ` [PATCH v3 11/29] bsd-user/arm/target_arch_vmparam.h: Parameters for arm address space Warner Losh
2021-11-04 14:05 ` [PATCH v3 12/29] bsd-user/arm/target_arch_sigtramp.h: Signal Trampoline for arm Warner Losh
2021-11-04 14:05 ` [PATCH v3 13/29] bsd-user/arm/target_arch_thread.h: Routines to create and switch to a thread Warner Losh
2021-11-04 14:05 ` [PATCH v3 14/29] bsd-user/arm/target_arch_elf.h: arm defines for ELF Warner Losh
2021-11-04 14:05 ` [PATCH v3 15/29] bsd-user/arm/target_arch_elf.h: arm get hwcap Warner Losh
2021-11-04 14:05 ` [PATCH v3 16/29] bsd-user/arm/target_arch_elf.h: arm get_hwcap2 impl Warner Losh
2021-11-04 14:05 ` Warner Losh [this message]
2021-11-04 14:05 ` [PATCH v3 18/29] bsd-user/arm/target_arch_signal.h: arm specific signal registers and stack Warner Losh
2021-11-04 14:05 ` [PATCH v3 19/29] bsd-user/arm/target_arch_signal.h: arm machine context for signals Warner Losh
2021-11-04 17:48 ` Richard Henderson
2021-11-04 17:58 ` Warner Losh
2021-11-04 18:26 ` Warner Losh
2021-11-04 20:56 ` Warner Losh
2021-11-04 14:05 ` [PATCH v3 20/29] bsd-user/arm/target_arch_signal.h: arm user context and trapframe " Warner Losh
2021-11-04 14:05 ` [PATCH v3 21/29] bsd-user/arm/target_arch_signal.h: arm set_sigtramp_args Warner Losh
2021-11-04 14:05 ` [PATCH v3 22/29] bsd-user/arm/target_arch_signal.h: arm get_mcontext Warner Losh
2021-11-04 14:05 ` [PATCH v3 23/29] bsd-user/arm/target_arch_signal.h: arm set_mcontext Warner Losh
2021-11-04 18:41 ` Richard Henderson
2021-11-04 23:59 ` Warner Losh
2021-11-04 14:05 ` [PATCH v3 24/29] bsd-user/arm/target_arch_signal.h: arm get_ucontext_sigreturn Warner Losh
2021-11-04 14:05 ` [PATCH v3 25/29] bsd-user: add arm target build Warner Losh
2021-11-04 14:05 ` [PATCH v3 26/29] bsd-user/i386/target_arch_signal.h: Remove target_sigcontext Warner Losh
2021-11-04 14:05 ` [PATCH v3 27/29] bsd-user/x86_64/target_arch_signal.h: " Warner Losh
2021-11-04 14:05 ` [PATCH v3 28/29] bsd-user/i386/target_arch_signal.h: use new target_os_ucontext.h Warner Losh
2021-11-04 14:05 ` [PATCH v3 29/29] bsd-user/x86_64/target_arch_signal.h: " Warner Losh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211104140536.42573-18-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=f4bug@amsat.org \
--cc=kevans@freebsd.org \
--cc=laurent@vivier.eu \
--cc=mjt@tls.msk.ru \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).