[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/13] linux-user/sparc: Fix cpu_clone_regs_*
From: |
Laurent Vivier |
Subject: |
[PULL 12/13] linux-user/sparc: Fix cpu_clone_regs_* |
Date: |
Tue, 5 Nov 2019 19:11:18 +0100 |
From: Richard Henderson <address@hidden>
We failed to set the secondary return value in %o1
we failed to advance the PC past the syscall,
we failed to adjust regwptr into the new structure,
we stored the stack pointer into the wrong register.
Signed-off-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/sparc/target_cpu.h | 43 +++++++++++++++++++++++++++++------
1 file changed, 36 insertions(+), 7 deletions(-)
diff --git a/linux-user/sparc/target_cpu.h b/linux-user/sparc/target_cpu.h
index 8ff706adcef7..14b21589699b 100644
--- a/linux-user/sparc/target_cpu.h
+++ b/linux-user/sparc/target_cpu.h
@@ -23,22 +23,51 @@
static inline void cpu_clone_regs_child(CPUSPARCState *env, target_ulong newsp,
unsigned flags)
{
+ /*
+ * After cpu_copy, env->regwptr is pointing into the old env.
+ * Update the new cpu to use its own register window.
+ */
+ env->regwptr = env->regbase + (env->cwp * 16);
+
if (newsp) {
- env->regwptr[22] = newsp;
+ /* When changing stacks, do it with clean register windows. */
+#ifdef TARGET_SPARC64
+ env->cansave = env->nwindows - 2;
+ env->cleanwin = env->nwindows - 2;
+ env->canrestore = 0;
+#else
+ env->wim = 1 << env->cwp;
+#endif
+ /* ??? The kernel appears to copy one stack frame to the new stack. */
+ /* ??? The kernel force aligns the new stack. */
+ env->regwptr[WREG_SP] = newsp;
}
- /* syscall return for clone child: 0, and clear CF since
- * this counts as a success return value.
- */
- env->regwptr[0] = 0;
+
+ if (flags & CLONE_VM) {
+ /*
+ * Syscall return for clone child: %o0 = 0 and clear CF since this
+ * counts as a success return value. Advance the PC past the syscall.
+ * For fork child, all of this happens in cpu_loop, and we must not
+ * do the pc advance twice.
+ */
+ env->regwptr[WREG_O0] = 0;
#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
- env->xcc &= ~PSR_CARRY;
+ env->xcc &= ~PSR_CARRY;
#else
- env->psr &= ~PSR_CARRY;
+ env->psr &= ~PSR_CARRY;
#endif
+ env->pc = env->npc;
+ env->npc = env->npc + 4;
+ }
+
+ /* Set the second return value for the child: %o1 = 1. */
+ env->regwptr[WREG_O1] = 1;
}
static inline void cpu_clone_regs_parent(CPUSPARCState *env, unsigned flags)
{
+ /* Set the second return value for the parent: %o1 = 0. */
+ env->regwptr[WREG_O1] = 0;
}
static inline void cpu_set_tls(CPUSPARCState *env, target_ulong newtls)
--
2.21.0
- [PULL 13/13] linux-user/alpha: Set r20 secondary return value, (continued)
- [PULL 13/13] linux-user/alpha: Set r20 secondary return value, Laurent Vivier, 2019/11/05
- [PULL 01/13] linux-user: Support for NETLINK socket options, Laurent Vivier, 2019/11/05
- [PULL 10/13] linux-user: Rename cpu_clone_regs to cpu_clone_regs_child, Laurent Vivier, 2019/11/05
- [PULL 07/13] linux-user/sparc: Use WREG_SP constant in sparc/signal.c, Laurent Vivier, 2019/11/05
- [PULL 02/13] scripts/qemu-binfmt-conf: Update for sparc64, Laurent Vivier, 2019/11/05
- [PULL 09/13] linux-user/sparc64: Fix target_signal_frame, Laurent Vivier, 2019/11/05
- [PULL 06/13] linux-user/sparc: Begin using WREG constants in sparc/signal.c, Laurent Vivier, 2019/11/05
- [PULL 05/13] linux-user/sparc: Use WREG constants in sparc/target_cpu.h, Laurent Vivier, 2019/11/05
- [PULL 04/13] target/sparc: Define an enumeration for accessing env->regwptr, Laurent Vivier, 2019/11/05
- [PULL 03/13] tests/tcg/multiarch/linux-test: Fix error check for shmat, Laurent Vivier, 2019/11/05
- [PULL 12/13] linux-user/sparc: Fix cpu_clone_regs_*,
Laurent Vivier <=
- [PULL 08/13] linux-user/sparc: Fix WREG usage in setup_frame, Laurent Vivier, 2019/11/05
- [PULL 11/13] linux-user: Introduce cpu_clone_regs_parent, Laurent Vivier, 2019/11/05
- Re: [PULL 00/13] Linux user for 4.2 patches, no-reply, 2019/11/05