From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, kevans@freebsd.org,
"Michael Tokarev" <mjt@tls.msk.ru>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Laurent Vivier" <laurent@vivier.eu>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Warner Losh" <imp@bsdimp.com>
Subject: [PULL 06/37] bsd-user/i386/target_arch_signal.h: Update mcontext_t to match FreeBSD
Date: Sat, 8 Jan 2022 00:37:06 -0700 [thread overview]
Message-ID: <20220108073737.5959-7-imp@bsdimp.com> (raw)
In-Reply-To: <20220108073737.5959-1-imp@bsdimp.com>
Fill in target_mcontext_t to match the FreeBSD mcontex_t. Also tag the
current size of mcontext and ucontext to enable size checking for i386.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/i386/target_arch_signal.h | 46 ++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/bsd-user/i386/target_arch_signal.h b/bsd-user/i386/target_arch_signal.h
index bf7263c4f8d..701c6f964f8 100644
--- a/bsd-user/i386/target_arch_signal.h
+++ b/bsd-user/i386/target_arch_signal.h
@@ -28,8 +28,54 @@
#define TARGET_SIGSTKSZ (MINSIGSTKSZ + 32768) /* recommended size */
typedef struct target_mcontext {
+ abi_ulong mc_onstack; /* XXX - sigcontext compat. */
+ abi_ulong mc_gs; /* machine state (struct trapframe) */
+ abi_ulong mc_fs;
+ abi_ulong mc_es;
+ abi_ulong mc_ds;
+ abi_ulong mc_edi;
+ abi_ulong mc_esi;
+ abi_ulong mc_ebp;
+ abi_ulong mc_isp;
+ abi_ulong mc_ebx;
+ abi_ulong mc_edx;
+ abi_ulong mc_ecx;
+ abi_ulong mc_eax;
+ abi_ulong mc_trapno;
+ abi_ulong mc_err;
+ abi_ulong mc_eip;
+ abi_ulong mc_cs;
+ abi_ulong mc_eflags;
+ abi_ulong mc_esp;
+ abi_ulong mc_ss;
+
+ int32_t mc_len; /* sizeof(mcontext_t) */
+#define _MC_FPFMT_NODEV 0x10000 /* device not present or configured */
+#define _MC_FPFMT_387 0x10001
+#define _MC_FPFMT_XMM 0x10002
+ int32_t mc_fpformat;
+#define _MC_FPOWNED_NONE 0x20000 /* FP state not used */
+#define _MC_FPOWNED_FPU 0x20001 /* FP state came from FPU */
+#define _MC_FPOWNED_PCB 0x20002 /* FP state came from PCB */
+ int32_t mc_ownedfp;
+ abi_ulong mc_flags;
+ /*
+ * See <machine/npx.h> for the internals of mc_fpstate[].
+ */
+ int32_t mc_fpstate[128] __aligned(16);
+
+ abi_ulong mc_fsbase;
+ abi_ulong mc_gsbase;
+
+ abi_ulong mc_xfpustate;
+ abi_ulong mc_xfpustate_len;
+
+ int32_t mc_spare2[4];
} target_mcontext_t;
+#define TARGET_MCONTEXT_SIZE 640
+#define TARGET_UCONTEXT_SIZE 704
+
#include "target_os_ucontext.h"
struct target_sigframe {
--
2.33.1
next prev parent reply other threads:[~2022-01-08 7:49 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-08 7:37 [PULL 00/37] Bsd user arm patches Warner Losh
2022-01-08 7:37 ` [PULL 01/37] bsd-user/mips*: Remove mips support Warner Losh
2022-01-08 7:37 ` [PULL 02/37] bsd-user/freebsd: Create common target_os_ucontext.h file Warner Losh
2022-01-08 7:37 ` [PULL 03/37] bsd-user: create a per-arch signal.c file Warner Losh
2022-01-08 7:37 ` [PULL 04/37] bsd-user/i386/target_arch_signal.h: Remove target_sigcontext Warner Losh
2022-01-08 7:37 ` [PULL 05/37] bsd-user/i386/target_arch_signal.h: use new target_os_ucontext.h Warner Losh
2022-01-08 7:37 ` Warner Losh [this message]
2022-01-08 7:37 ` [PULL 07/37] bsd-user/i386: Move the inlines into signal.c Warner Losh
2022-01-08 7:37 ` [PULL 08/37] bsd-user/x86_64/target_arch_signal.h: Remove target_sigcontext Warner Losh
2022-01-08 7:37 ` [PULL 09/37] bsd-user/x86_64/target_arch_signal.h: use new target_os_ucontext.h Warner Losh
2022-01-08 7:37 ` [PULL 10/37] bsd-user/x86_64/target_arch_signal.h: Fill in mcontext_t Warner Losh
2022-01-08 7:37 ` [PULL 11/37] bsd-user/x86_64: Move functions into signal.c Warner Losh
2022-01-08 7:37 ` [PULL 12/37] bsd-user/target_os_signal.h: Move signal prototypes to target_os_ucontext.h Warner Losh
2022-01-08 7:37 ` [PULL 13/37] bsd-user/arm/target_arch_sysarch.h: Use consistent include guards Warner Losh
2022-01-08 7:37 ` [PULL 14/37] bsd-user/arm/target_syscall.h: Add copyright and update name Warner Losh
2022-01-08 7:37 ` [PULL 15/37] bsd-user/arm/target_arch_cpu.c: Target specific TLS routines Warner Losh
2022-01-08 7:37 ` [PULL 16/37] bsd-user/arm/target_arch_cpu.h: CPU Loop definitions Warner Losh
2022-01-08 7:37 ` [PULL 17/37] bsd-user/arm/target_arch_cpu.h: Implement target_cpu_clone_regs Warner Losh
2022-01-08 7:37 ` [PULL 18/37] bsd-user/arm/target_arch_cpu.h: Dummy target_cpu_loop implementation Warner Losh
2022-01-08 7:37 ` [PULL 19/37] bsd-user/arm/target_arch_cpu.h: Implement trivial EXCP exceptions Warner Losh
2022-01-08 7:37 ` [PULL 20/37] bsd-user/arm/target_arch_cpu.h: Implement data abort exceptions Warner Losh
2022-01-08 7:37 ` [PULL 21/37] bsd-user/arm/target_arch_cpu.h: Implement system call dispatch Warner Losh
2022-01-08 7:37 ` [PULL 22/37] bsd-user/arm/target_arch_reg.h: Implement core dump register copying Warner Losh
2022-01-08 7:37 ` [PULL 23/37] bsd-user/arm/target_arch_vmparam.h: Parameters for arm address space Warner Losh
2022-01-08 7:37 ` [PULL 24/37] bsd-user/arm/target_arch_sigtramp.h: Signal Trampoline for arm Warner Losh
2022-01-08 7:37 ` [PULL 25/37] bsd-user/arm/target_arch_thread.h: Routines to create and switch to a thread Warner Losh
2022-01-08 7:37 ` [PULL 26/37] bsd-user/arm/target_arch_elf.h: arm defines for ELF Warner Losh
2022-01-08 7:37 ` [PULL 27/37] bsd-user/arm/target_arch_elf.h: arm get hwcap Warner Losh
2022-01-08 7:37 ` [PULL 28/37] bsd-user/arm/target_arch_elf.h: arm get_hwcap2 impl Warner Losh
2022-01-08 7:37 ` [PULL 29/37] bsd-user/arm/target_arch_signal.h: arm specific signal registers and stack Warner Losh
2022-01-08 7:37 ` [PULL 30/37] bsd-user/arm/target_arch_signal.h: arm machine context and trapframe for signals Warner Losh
2022-01-08 7:37 ` [PULL 31/37] bsd-user/arm/target_arch_signal.h: Define size of *context_t Warner Losh
2022-01-08 7:37 ` [PULL 32/37] bsd-user/arm/signal.c: arm set_sigtramp_args Warner Losh
2022-01-08 7:37 ` [PULL 33/37] bsd-user/arm/signal.c: arm get_mcontext Warner Losh
2022-01-08 7:37 ` [PULL 34/37] bsd-user/arm/signal.c: arm set_mcontext Warner Losh
2022-01-08 7:37 ` [PULL 35/37] bsd-user/arm/signal.c: arm get_ucontext_sigreturn Warner Losh
2022-01-08 7:37 ` [PULL 36/37] bsd-user/freebsd/target_os_ucontext.h: Require TARGET_*CONTEXT_SIZE Warner Losh
2022-01-08 7:37 ` [PULL 37/37] bsd-user: add arm target build Warner Losh
2022-01-08 19:18 ` [PULL 00/37] Bsd user arm patches Richard Henderson
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=20220108073737.5959-7-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).