qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: "Stacey Son" <sson@FreeBSD.org>,
	qemu-trivial@nongnu.org, "Kyle Evans" <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 34/37] bsd-user/arm/signal.c: arm set_mcontext
Date: Sat,  8 Jan 2022 00:37:34 -0700	[thread overview]
Message-ID: <20220108073737.5959-35-imp@bsdimp.com> (raw)
In-Reply-To: <20220108073737.5959-1-imp@bsdimp.com>

Move the machine context to the CPU state.

Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
 bsd-user/arm/signal.c | 76 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/bsd-user/arm/signal.c b/bsd-user/arm/signal.c
index 93c9bfc0d37..fb6228db6cf 100644
--- a/bsd-user/arm/signal.c
+++ b/bsd-user/arm/signal.c
@@ -109,3 +109,79 @@ abi_long get_mcontext(CPUARMState *env, target_mcontext_t *mcp, int flags)
     }
     return err;
 }
+
+/* Compare to arm/arm/exec_machdep.c set_mcontext() */
+abi_long set_mcontext(CPUARMState *env, target_mcontext_t *mcp, int srflag)
+{
+    int err = 0;
+    const uint32_t *gr = mcp->__gregs;
+    uint32_t cpsr, ccpsr = cpsr_read(env);
+    uint32_t fpscr, mask;
+
+    cpsr = tswap32(gr[TARGET_REG_CPSR]);
+    /*
+     * Only allow certain bits to change, reject attempted changes to non-user
+     * bits. In addition, make sure we're headed for user mode and none of the
+     * interrupt bits are set.
+     */
+    if ((ccpsr & ~CPSR_USER) != (cpsr & ~CPSR_USER)) {
+        return -TARGET_EINVAL;
+    }
+    if ((cpsr & CPSR_M) != ARM_CPU_MODE_USR ||
+        (cpsr & (CPSR_I | CPSR_F)) != 0) {
+        return -TARGET_EINVAL;
+    }
+
+    /*
+     * The movs pc,lr instruction that implements the return to userland masks
+     * these bits out.
+     */
+    mask = cpsr & CPSR_T ? 0x1 : 0x3;
+
+    /*
+     * Make sure that we either have no vfp, or it's the correct size.
+     * FreeBSD just ignores it, though, so maybe we'll need to adjust
+     * things below instead.
+     */
+    if (mcp->mc_vfp_size != 0 && mcp->mc_vfp_size != sizeof(target_mcontext_vfp_t)) {
+        return -TARGET_EINVAL;
+    }
+
+    env->regs[0] = tswap32(gr[TARGET_REG_R0]);
+    env->regs[1] = tswap32(gr[TARGET_REG_R1]);
+    env->regs[2] = tswap32(gr[TARGET_REG_R2]);
+    env->regs[3] = tswap32(gr[TARGET_REG_R3]);
+    env->regs[4] = tswap32(gr[TARGET_REG_R4]);
+    env->regs[5] = tswap32(gr[TARGET_REG_R5]);
+    env->regs[6] = tswap32(gr[TARGET_REG_R6]);
+    env->regs[7] = tswap32(gr[TARGET_REG_R7]);
+    env->regs[8] = tswap32(gr[TARGET_REG_R8]);
+    env->regs[9] = tswap32(gr[TARGET_REG_R9]);
+    env->regs[10] = tswap32(gr[TARGET_REG_R10]);
+    env->regs[11] = tswap32(gr[TARGET_REG_R11]);
+    env->regs[12] = tswap32(gr[TARGET_REG_R12]);
+
+    env->regs[13] = tswap32(gr[TARGET_REG_SP]);
+    env->regs[14] = tswap32(gr[TARGET_REG_LR]);
+    env->regs[15] = tswap32(gr[TARGET_REG_PC] & ~mask);
+    if (mcp->mc_vfp_size != 0 && mcp->mc_vfp_ptr != 0) {
+        /* see set_vfpcontext in sys/arm/arm/exec_machdep.c */
+        target_mcontext_vfp_t *vfp;
+
+        vfp = lock_user(VERIFY_READ, mcp->mc_vfp_ptr, sizeof(*vfp), 1);
+        for (int i = 0; i < 32; i++) {
+            __get_user(*aa32_vfp_dreg(env, i), &vfp->mcv_reg[i]);
+        }
+        __get_user(fpscr, &vfp->mcv_fpscr);
+        vfp_set_fpscr(env, fpscr);
+        unlock_user(vfp, mcp->mc_vfp_ptr, sizeof(target_ucontext_t));
+
+        /*
+         * linux-user sets fpexc, fpinst and fpinst2, but these aren't in
+         * FreeBSD's mcontext, what to do?
+         */
+    }
+    cpsr_write(env, cpsr, CPSR_USER | CPSR_EXEC, CPSRWriteByInstr);
+
+    return err;
+}
-- 
2.33.1



  parent reply	other threads:[~2022-01-08  8:48 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 ` [PULL 06/37] bsd-user/i386/target_arch_signal.h: Update mcontext_t to match FreeBSD Warner Losh
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 ` Warner Losh [this message]
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-35-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 \
    --cc=sson@FreeBSD.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).