[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 07/13] linux-user: Enable NPTL for SPARC targets
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v3 07/13] linux-user: Enable NPTL for SPARC targets |
Date: |
Tue, 16 Jul 2013 18:44:54 +0100 |
Provide the missing cpu_set_tls(), and resolve the FIXME in
cpu_clone_regs() by clearing the carry flag for the child.
This allows us to turn on building with NPTL for SPARC.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
configure | 3 ---
linux-user/sparc/target_cpu.h | 16 ++++++++++++----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 3848c1c..117191e 100755
--- a/configure
+++ b/configure
@@ -4255,18 +4255,15 @@ case "$target_name" in
bflt="yes"
;;
sparc)
- target_nptl="no"
;;
sparc64)
TARGET_BASE_ARCH=sparc
- target_nptl="no"
;;
sparc32plus)
TARGET_ARCH=sparc64
TARGET_BASE_ARCH=sparc
TARGET_ABI_DIR=sparc
echo "TARGET_ABI32=y" >> $config_target_mak
- target_nptl="no"
;;
s390x)
;;
diff --git a/linux-user/sparc/target_cpu.h b/linux-user/sparc/target_cpu.h
index 5a620a2..4944d46 100644
--- a/linux-user/sparc/target_cpu.h
+++ b/linux-user/sparc/target_cpu.h
@@ -25,12 +25,20 @@ static inline void cpu_clone_regs(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.
+ */
env->regwptr[0] = 0;
- /* FIXME: Do we also need to clear CF? */
- /* XXXXX */
- printf("HELPME: %s:%d\n", __FILE__, __LINE__);
+#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
+ env->xcc &= ~PSR_CARRY;
+#else
+ env->psr &= ~PSR_CARRY;
+#endif
}
-/* TODO: need to implement cpu_set_tls() */
+static inline void cpu_set_tls(CPUSPARCState *env, target_ulong newtls)
+{
+ env->gregs[7] = newtls;
+}
#endif
--
1.7.9.5
- Re: [Qemu-devel] [PATCH v3 03/13] configure: Enable threading on all ppc and mips linux-user targets, (continued)
- [Qemu-devel] [PATCH v3 06/13] linux-user: Enable NPTL for OpenRISC, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 05/13] linux-user: Move includes of target-specific headers to end of qemu.h, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 08/13] linux-user: Enable NPTL for m68k, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 01/13] configure: Flip default of target_nptl, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 11/13] linux-user: Add i386 TLS setter, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 02/13] configure: Don't say target_nptl="no" if there is no linux-user target, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 10/13] linux-user: Clean up handling of clone() argument order, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 07/13] linux-user: Enable NPTL for SPARC targets,
Peter Maydell <=
- [Qemu-devel] [PATCH v3 09/13] linux-user: Add missing 'break' in i386 get_thread_area syscall, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 04/13] configure: Enable threading for unicore32-linux-user, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 13/13] configure: Make NPTL non-optional, Peter Maydell, 2013/07/16
- Re: [Qemu-devel] [PATCH v3 00/13] linux-user: enable NPTL on everything, Peter Maydell, 2013/07/22