From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <laurent@vivier.eu>,
Michael Tokarev <mjt@tls.msk.ru>, Warner Losh <imp@bsdimp.com>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
Kyle Evans <kevans@freebsd.org>,
Philippe Mathieu-Daude <f4bug@amsat.org>,
qemu-trivial@nongnu.org,
Richard Henderson <richard.henderson@linaro.org>
Subject: [PATCH v5 10/37] bsd-user/x86_64/target_arch_signal.h: Fill in mcontext_t
Date: Sun, 7 Nov 2021 20:51:09 -0700 [thread overview]
Message-ID: <20211108035136.43687-11-imp@bsdimp.com> (raw)
In-Reply-To: <20211108035136.43687-1-imp@bsdimp.com>
Fill in target_mcontext match the FreeBSD mcontext_t structure. Also
define the size correctly.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/x86_64/target_arch_signal.h | 54 ++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/bsd-user/x86_64/target_arch_signal.h b/bsd-user/x86_64/target_arch_signal.h
index e84aff948c..720e3939c3 100644
--- a/bsd-user/x86_64/target_arch_signal.h
+++ b/bsd-user/x86_64/target_arch_signal.h
@@ -28,8 +28,62 @@
#define TARGET_SIGSTKSZ (MINSIGSTKSZ + 32768) /* recommended size */
typedef struct target_mcontext {
+ abi_ulong mc_onstack; /* XXX - sigcontext compat. */
+ abi_ulong mc_rdi; /* machine state (struct trapframe) */
+ abi_ulong mc_rsi;
+ abi_ulong mc_rdx;
+ abi_ulong mc_rcx;
+ abi_ulong mc_r8;
+ abi_ulong mc_r9;
+ abi_ulong mc_rax;
+ abi_ulong mc_rbx;
+ abi_ulong mc_rbp;
+ abi_ulong mc_r10;
+ abi_ulong mc_r11;
+ abi_ulong mc_r12;
+ abi_ulong mc_r13;
+ abi_ulong mc_r14;
+ abi_ulong mc_r15;
+ uint32_t mc_trapno;
+ uint16_t mc_fs;
+ uint16_t mc_gs;
+ abi_ulong mc_addr;
+ uint32_t mc_flags;
+ uint16_t mc_es;
+ uint16_t mc_ds;
+ abi_ulong mc_err;
+ abi_ulong mc_rip;
+ abi_ulong mc_cs;
+ abi_ulong mc_rflags;
+ abi_ulong mc_rsp;
+ abi_ulong mc_ss;
+
+ abi_long mc_len; /* sizeof(mcontext_t) */
+
+#define _MC_FPFMT_NODEV 0x10000 /* device not present or configured */
+#define _MC_FPFMT_XMM 0x10002
+ abi_long 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 */
+ abi_long mc_ownedfp;
+ /*
+ * See <machine/fpu.h> for the internals of mc_fpstate[].
+ */
+ abi_long mc_fpstate[64] __aligned(16);
+
+ abi_ulong mc_fsbase;
+ abi_ulong mc_gsbase;
+
+ abi_ulong mc_xfpustate;
+ abi_ulong mc_xfpustate_len;
+
+ abi_long mc_spare[4];
} target_mcontext_t;
+#define TARGET_MCONTEXT_SIZE 800
+#define TARGET_UCONTEXT_SIZE 880
+
#include "target_os_ucontext.h"
struct target_sigframe {
--
2.33.0
WARNING: multiple messages have this Message-ID (diff)
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 v5 10/37] bsd-user/x86_64/target_arch_signal.h: Fill in mcontext_t
Date: Sun, 7 Nov 2021 20:51:09 -0700 [thread overview]
Message-ID: <20211108035136.43687-11-imp@bsdimp.com> (raw)
In-Reply-To: <20211108035136.43687-1-imp@bsdimp.com>
Fill in target_mcontext match the FreeBSD mcontext_t structure. Also
define the size correctly.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/x86_64/target_arch_signal.h | 54 ++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/bsd-user/x86_64/target_arch_signal.h b/bsd-user/x86_64/target_arch_signal.h
index e84aff948c..720e3939c3 100644
--- a/bsd-user/x86_64/target_arch_signal.h
+++ b/bsd-user/x86_64/target_arch_signal.h
@@ -28,8 +28,62 @@
#define TARGET_SIGSTKSZ (MINSIGSTKSZ + 32768) /* recommended size */
typedef struct target_mcontext {
+ abi_ulong mc_onstack; /* XXX - sigcontext compat. */
+ abi_ulong mc_rdi; /* machine state (struct trapframe) */
+ abi_ulong mc_rsi;
+ abi_ulong mc_rdx;
+ abi_ulong mc_rcx;
+ abi_ulong mc_r8;
+ abi_ulong mc_r9;
+ abi_ulong mc_rax;
+ abi_ulong mc_rbx;
+ abi_ulong mc_rbp;
+ abi_ulong mc_r10;
+ abi_ulong mc_r11;
+ abi_ulong mc_r12;
+ abi_ulong mc_r13;
+ abi_ulong mc_r14;
+ abi_ulong mc_r15;
+ uint32_t mc_trapno;
+ uint16_t mc_fs;
+ uint16_t mc_gs;
+ abi_ulong mc_addr;
+ uint32_t mc_flags;
+ uint16_t mc_es;
+ uint16_t mc_ds;
+ abi_ulong mc_err;
+ abi_ulong mc_rip;
+ abi_ulong mc_cs;
+ abi_ulong mc_rflags;
+ abi_ulong mc_rsp;
+ abi_ulong mc_ss;
+
+ abi_long mc_len; /* sizeof(mcontext_t) */
+
+#define _MC_FPFMT_NODEV 0x10000 /* device not present or configured */
+#define _MC_FPFMT_XMM 0x10002
+ abi_long 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 */
+ abi_long mc_ownedfp;
+ /*
+ * See <machine/fpu.h> for the internals of mc_fpstate[].
+ */
+ abi_long mc_fpstate[64] __aligned(16);
+
+ abi_ulong mc_fsbase;
+ abi_ulong mc_gsbase;
+
+ abi_ulong mc_xfpustate;
+ abi_ulong mc_xfpustate_len;
+
+ abi_long mc_spare[4];
} target_mcontext_t;
+#define TARGET_MCONTEXT_SIZE 800
+#define TARGET_UCONTEXT_SIZE 880
+
#include "target_os_ucontext.h"
struct target_sigframe {
--
2.33.0
next prev parent reply other threads:[~2021-11-08 3:58 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-08 3:50 [PATCH v5 00/37] bsd-user: arm (32-bit) support Warner Losh
2021-11-08 3:50 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 01/37] bsd-user/mips*: Remove mips support Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-12-13 10:11 ` Philippe Mathieu-Daudé
2021-12-13 10:11 ` Philippe Mathieu-Daudé
2021-11-08 3:51 ` [PATCH v5 02/37] bsd-user/freebsd: Create common target_os_ucontext.h file Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 03/37] bsd-user: create a per-arch signal.c file Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 04/37] bsd-user/i386/target_arch_signal.h: Remove target_sigcontext Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 05/37] bsd-user/i386/target_arch_signal.h: use new target_os_ucontext.h Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 06/37] bsd-user/i386/target_arch_signal.h: Update mcontext_t to match FreeBSD Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 07/37] bsd-user/i386: Move the inlines into signal.c Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 08/37] bsd-user/x86_64/target_arch_signal.h: Remove target_sigcontext Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 09/37] bsd-user/x86_64/target_arch_signal.h: use new target_os_ucontext.h Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` Warner Losh [this message]
2021-11-08 3:51 ` [PATCH v5 10/37] bsd-user/x86_64/target_arch_signal.h: Fill in mcontext_t Warner Losh
2021-11-08 3:51 ` [PATCH v5 11/37] bsd-user/x86_64: Move functions into signal.c Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 12/37] bsd-user/target_os_signal.h: Move signal prototypes to target_os_ucontext.h Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 13/37] bsd-user/arm/target_arch_sysarch.h: Use consistent include guards Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 14/37] bsd-user/arm/target_syscall.h: Add copyright and update name Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 15/37] bsd-user/arm/target_arch_cpu.c: Target specific TLS routines Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 16/37] bsd-user/arm/target_arch_cpu.h: CPU Loop definitions Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 17/37] bsd-user/arm/target_arch_cpu.h: Implement target_cpu_clone_regs Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 18/37] bsd-user/arm/target_arch_cpu.h: Dummy target_cpu_loop implementation Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 19/37] bsd-user/arm/target_arch_cpu.h: Implement trivial EXCP exceptions Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 20/37] bsd-user/arm/target_arch_cpu.h: Implement data abort exceptions Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 21/37] bsd-user/arm/target_arch_cpu.h: Implement system call dispatch Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 22/37] bsd-user/arm/target_arch_reg.h: Implement core dump register copying Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 23/37] bsd-user/arm/target_arch_vmparam.h: Parameters for arm address space Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 24/37] bsd-user/arm/target_arch_sigtramp.h: Signal Trampoline for arm Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 25/37] bsd-user/arm/target_arch_thread.h: Routines to create and switch to a thread Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 26/37] bsd-user/arm/target_arch_elf.h: arm defines for ELF Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 27/37] bsd-user/arm/target_arch_elf.h: arm get hwcap Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 28/37] bsd-user/arm/target_arch_elf.h: arm get_hwcap2 impl Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 29/37] bsd-user/arm/target_arch_signal.h: arm specific signal registers and stack Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 30/37] bsd-user/arm/target_arch_signal.h: arm machine context and trapframe for signals Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 31/37] bsd-user/arm/target_arch_signal.h: Define size of *context_t Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 32/37] bsd-user/arm/signal.c: arm set_sigtramp_args Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 33/37] bsd-user/arm/signal.c: arm get_mcontext Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 34/37] bsd-user/arm/signal.c: arm set_mcontext Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 15:42 ` Richard Henderson
2021-11-08 15:42 ` Richard Henderson
2021-11-08 3:51 ` [PATCH v5 35/37] bsd-user/arm/signal.c: arm get_ucontext_sigreturn Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 36/37] bsd-user/freebsd/target_os_ucontext.h: Require TARGET_*CONTEXT_SIZE Warner Losh
2021-11-08 3:51 ` Warner Losh
2021-11-08 3:51 ` [PATCH v5 37/37] bsd-user: add arm target build Warner Losh
2021-11-08 3:51 ` 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=20211108035136.43687-11-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=f4bug@amsat.org \
--cc=jiaxun.yang@flygoat.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.