From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uz9QY-0007my-D4 for qemu-devel@nongnu.org; Tue, 16 Jul 2013 13:52:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uz9JI-0003R1-5I for qemu-devel@nongnu.org; Tue, 16 Jul 2013 13:45:19 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:58750 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uz9JH-0003GL-T8 for qemu-devel@nongnu.org; Tue, 16 Jul 2013 13:45:12 -0400 From: Peter Maydell Date: Tue, 16 Jul 2013 18:44:58 +0100 Message-Id: <1373996700-29286-12-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1373996700-29286-1-git-send-email-peter.maydell@linaro.org> References: <1373996700-29286-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v3 11/13] linux-user: Add i386 TLS setter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jia Liu , patches@linaro.org, Riku Voipio , Alexander Graf , Laurent Vivier , Blue Swirl , "Edgar E. Iglesias" , Guan Xuetao , Aurelien Jarno , Richard Henderson From: Alexander Graf We can easily set the TLS on i386. Add code to do so. Signed-off-by: Alexander Graf [PMM: also remove "target_nptl=no" line from configure, for consistency with other patches in this series] Signed-off-by: Peter Maydell --- configure | 1 - linux-user/i386/target_cpu.h | 12 ++++++++++-- linux-user/syscall.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 67e6437..8059b2b 100755 --- a/configure +++ b/configure @@ -4183,7 +4183,6 @@ TARGET_ABI_DIR="" case "$target_name" in i386) - target_nptl="no" ;; x86_64) TARGET_BASE_ARCH=i386 diff --git a/linux-user/i386/target_cpu.h b/linux-user/i386/target_cpu.h index abcac79..1170d84 100644 --- a/linux-user/i386/target_cpu.h +++ b/linux-user/i386/target_cpu.h @@ -28,6 +28,14 @@ static inline void cpu_clone_regs(CPUX86State *env, target_ulong newsp) env->regs[R_EAX] = 0; } -/* TODO: need to implement cpu_set_tls() */ +#if defined(TARGET_ABI32) +abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr); -#endif +static inline void cpu_set_tls(CPUX86State *env, target_ulong newtls) +{ + do_set_thread_area(env, newtls); + cpu_x86_load_seg(env, R_GS, env->segs[R_GS].selector); +} +#endif /* defined(TARGET_ABI32) */ + +#endif /* !defined(TARGET_CPU_H) */ diff --git a/linux-user/syscall.c b/linux-user/syscall.c index b167d7f..452b89d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4055,7 +4055,7 @@ static abi_long do_modify_ldt(CPUX86State *env, int func, abi_ulong ptr, } #if defined(TARGET_I386) && defined(TARGET_ABI32) -static abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr) +abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr) { uint64_t *gdt_table = g2h(env->gdt.base); struct target_modify_ldt_ldt_s ldt_info; -- 1.7.9.5