[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/21] linux-user: Add i386 TLS setter
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 11/21] linux-user: Add i386 TLS setter |
Date: |
Tue, 23 Jul 2013 18:49:01 +0300 |
From: Alexander Graf <address@hidden>
We can easily set the TLS on i386. Add code to do so.
Signed-off-by: Alexander Graf <address@hidden>
[PMM: also remove "target_nptl=no" line from configure, for
consistency with other patches in this series]
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
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 f065edc..547297b 100755
--- a/configure
+++ b/configure
@@ -4190,7 +4190,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.8.1.2
- [Qemu-devel] [PULL 15/21] linux-user: Fix target_stat and target_stat64 for OpenRISC, (continued)
- [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, 2013/07/23
- [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 <=
- [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