[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/13] linux-user/sparc: Fix cpu_clone_regs
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 08/13] linux-user/sparc: Fix cpu_clone_regs |
Date: |
Sun, 19 May 2019 13:19:48 -0700 |
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>
---
linux-user/sparc/target_cpu.h | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/linux-user/sparc/target_cpu.h b/linux-user/sparc/target_cpu.h
index 2c80db4889..a81f8216b7 100644
--- a/linux-user/sparc/target_cpu.h
+++ b/linux-user/sparc/target_cpu.h
@@ -22,22 +22,39 @@
static inline void cpu_clone_regs_child(CPUSPARCState *env, target_ulong newsp)
{
- if (newsp) {
- env->regwptr[22] = newsp;
- }
- /* syscall return for clone child: 0, and clear CF since
- * this counts as a success return value.
+ /*
+ * After cpu_copy, env->regwptr is pointing into old_env.
+ * Update the new cpu to use its own register window.
*/
- env->regwptr[0] = 0;
+ env->regwptr = env->regbase + (env->cwp * 16);
+
+ /* Set a new stack, if requested. */
+ if (newsp) {
+ /* ??? The kernel appears to copy one stack frame to the new stack. */
+ /* ??? The kernel force aligns the stack. */
+ env->regwptr[WREG_SP] = newsp;
+ }
+
+ /*
+ * Syscall return for clone child: %o0 = 0 and clear CF since
+ * this counts as a success return value. %o1 = 1 to indicate
+ * this is the child. Advance the PC past the syscall.
+ */
+ env->regwptr[WREG_O0] = 0;
#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
env->xcc &= ~PSR_CARRY;
#else
env->psr &= ~PSR_CARRY;
#endif
+ env->regwptr[WREG_O1] = 1;
+ env->pc = env->npc;
+ env->npc = env->npc + 4;
}
static inline void cpu_clone_regs_parent(CPUSPARCState *env)
{
+ /* 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.17.1
- [Qemu-devel] [PATCH 00/13] linux-user: path, clone, sparc, shmat fixes, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 01/13] util/path: Do not cache all filenames at startup, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 04/13] linux-user/alpha: Set r20 secondary return value, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 02/13] linux-user: Rename cpu_clone_regs to cpu_clone_regs_child, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 03/13] linux-user: Introduce cpu_clone_regs_parent, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 06/13] linux-user/sparc: Use WREG constants in sparc/target_cpu.h, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 05/13] target/sparc: Define an enumeration for accessing env->regwptr, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 08/13] linux-user/sparc: Fix cpu_clone_regs,
Richard Henderson <=
- [Qemu-devel] [PATCH 11/13] tests/tcg/multiarch/linux-test: Fix error check for shmat, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 07/13] linux-user/sparc: Use WREG constants in sparc/signal.c, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 09/13] linux-user/sparc: Flush register windows before clone/fork/vfork, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 10/13] scripts/qemu-binfmt-conf: Update for sparc64, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 12/13] linux-user: Fix shmat emulation by honoring host SHMLBA, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH 13/13] linux-user: Align mmap_find_vma to host page size, Richard Henderson, 2019/05/19