[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/21] linux-user: Enable NPTL for SPARC targets
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 07/21] linux-user: Enable NPTL for SPARC targets |
Date: |
Tue, 23 Jul 2013 18:48:57 +0300 |
From: Peter Maydell <address@hidden>
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>
Signed-off-by: Riku Voipio <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 bfad34e..ab3dc3c 100755
--- a/configure
+++ b/configure
@@ -4262,18 +4262,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.8.1.2
- [Qemu-devel] [PULL 03/21] configure: Enable threading on all ppc and mips linux-user targets, (continued)
- [Qemu-devel] [PULL 03/21] configure: Enable threading on all ppc and mips linux-user targets, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 04/21] configure: Enable threading for unicore32-linux-user, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 12/21] linux-user: Enable NPTL for x86-64, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 01/21] configure: Flip default of target_nptl, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 15/21] linux-user: Fix target_stat and target_stat64 for OpenRISC, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 17/21] linux-user: fix segmentation fault passing with h2g(x) != x, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 05/21] linux-user: Move includes of target-specific headers to end of qemu.h, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 08/21] linux-user: Enable NPTL for m68k, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 09/21] linux-user: Add missing 'break' in i386 get_thread_area syscall, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 18/21] linux-user: Fix epoll on ARM hosts, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 07/21] linux-user: Enable NPTL for SPARC targets,
riku . voipio <=
- [Qemu-devel] [PULL 10/21] linux-user: Clean up handling of clone() argument order, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 14/21] linux-user: Avoid conditional cpu_reset(), riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 16/21] linux-user: Fix pipe syscall return for SPARC, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 11/21] linux-user: Add i386 TLS setter, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 13/21] configure: Make NPTL non-optional, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 20/21] linux-user: Unlock mmap_lock when resuming guest from page_unprotect, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 21/21] linux-user: Handle compressed ISA encodings when processing MIPS exceptions, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 19/21] linux-user: Reset copied CPUs in cpu_copy() always, riku . voipio, 2013/07/23