diff options
| author | Peter Maydell | 2013-07-16 19:44:54 +0200 |
|---|---|---|
| committer | Riku Voipio | 2013-07-22 20:54:15 +0200 |
| commit | f5147c93d0e7f91df0215598017a4d9d6a48f0ee (patch) | |
| tree | 64644f08c061fd7204dd23cbb7e1f187ac538b54 /linux-user/sparc | |
| parent | linux-user: Enable NPTL for OpenRISC (diff) | |
| download | qemu-f5147c93d0e7f91df0215598017a4d9d6a48f0ee.tar.gz qemu-f5147c93d0e7f91df0215598017a4d9d6a48f0ee.tar.xz qemu-f5147c93d0e7f91df0215598017a4d9d6a48f0ee.zip | |
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>
Diffstat (limited to 'linux-user/sparc')
| -rw-r--r-- | linux-user/sparc/target_cpu.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/linux-user/sparc/target_cpu.h b/linux-user/sparc/target_cpu.h index 5a620a2bb7..4944d465a2 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 |