falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: Enable NPTL for SPARC targets 

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>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2013-07-16 18:44:54 +01:00 committed by Riku Voipio
parent 442a59c8dd
commit f5147c93d0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -4262,18 +4262,15 @@ case "$target_name" in
bflt="yes" bflt="yes"
;; ;;
sparc) sparc)
target_nptl="no"
;; ;;
sparc64) sparc64)
TARGET_BASE_ARCH=sparc TARGET_BASE_ARCH=sparc
target_nptl="no"
;; ;;
sparc32plus) sparc32plus)
TARGET_ARCH=sparc64 TARGET_ARCH=sparc64
TARGET_BASE_ARCH=sparc TARGET_BASE_ARCH=sparc
TARGET_ABI_DIR=sparc TARGET_ABI_DIR=sparc
echo "TARGET_ABI32=y" >> $config_target_mak echo "TARGET_ABI32=y" >> $config_target_mak
target_nptl="no"
;; ;;
s390x) s390x)
;; ;;

16
linux-user/sparc/target_cpu.h
View File

@ -25,12 +25,20 @@ static inline void cpu_clone_regs(CPUSPARCState *env, target_ulong newsp)
if (newsp) { if (newsp) {
env->regwptr[22] = 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; env->regwptr[0] = 0;
/* FIXME: Do we also need to clear CF? */ #if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
/* XXXXX */ env->xcc &= ~PSR_CARRY;
printf("HELPME: %s:%d\n", __FILE__, __LINE__); #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 #endif