Patchwork [7/8] linux-user: Enable NPTL for SPARC targets

login
register
mail settings
Submitter Peter Maydell
Date July 12, 2013, 8:12 p.m.
Message ID <1373659973-23289-8-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/258790/
State New
Headers show

Comments

Peter Maydell - July 12, 2013, 8:12 p.m.
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 <peter.maydell@linaro.org>
---
 configure                     |    3 ---
 linux-user/sparc/target_cpu.h |   16 ++++++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)
Richard Henderson - July 13, 2013, 9:01 p.m.
On 07/12/2013 01:12 PM, Peter Maydell wrote:
> 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 <peter.maydell@linaro.org>

Reviewed-by: Richard Henderson <rth@twiddle.net>


r~

Patch

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