summary refs log tree commit diff stats
path: root/linux-user
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-03-02 20:48:00 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-03-02 20:48:00 +0000
commit6f5b89a07c90ebaa7caf744927f977d78d366326 (patch)
treebea887cff59c2d381131d70d3057bb14e882ed6e /linux-user
parentc05ac0cdac0c4592876424f9c467484bb1eb2bb6 (diff)
downloadfocaccia-qemu-6f5b89a07c90ebaa7caf744927f977d78d366326.tar.gz
focaccia-qemu-6f5b89a07c90ebaa7caf744927f977d78d366326.zip
MIPS Userland TLS register emulation, by Daniel Jacobowitz.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2465 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/main.c1
-rw-r--r--linux-user/mips/syscall_nr.h2
-rw-r--r--linux-user/syscall.c21
3 files changed, 22 insertions, 2 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 3eb573db69..3671384486 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -1297,6 +1297,7 @@ static const uint8_t mips_syscall_args[] = {
 	MIPS_SYS(sys_add_key	, 5)
 	MIPS_SYS(sys_request_key	, 4)
 	MIPS_SYS(sys_keyctl	, 5)
+	MIPS_SYS(sys_set_thread_area, 1)
 };
 
 #undef MIPS_SYS
diff --git a/linux-user/mips/syscall_nr.h b/linux-user/mips/syscall_nr.h
index 3593e65d05..e869bcdd66 100644
--- a/linux-user/mips/syscall_nr.h
+++ b/linux-user/mips/syscall_nr.h
@@ -285,4 +285,4 @@
 #define TARGET_NR_add_key			(TARGET_NR_Linux + 280)
 #define TARGET_NR_request_key		(TARGET_NR_Linux + 281)
 #define TARGET_NR_keyctl			(TARGET_NR_Linux + 282)
-
+#define TARGET_NR_set_thread_area	(TARGET_NR_Linux + 283)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 76b36524a1..acd098d87c 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -165,6 +165,9 @@ _syscall3(int,sys_syslog,int,type,char*,bufp,int,len)
 #ifdef __NR_exit_group
 _syscall1(int,exit_group,int,error_code)
 #endif
+#if defined(TARGET_NR_set_tid_address) && defined(__NR_set_tid_address)
+_syscall1(int,set_tid_address,int *,tidptr)
+#endif
 
 extern int personality(int);
 extern int flock(int, int);
@@ -3968,6 +3971,15 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
 #endif
 #ifdef TARGET_NR_set_thread_area
     case TARGET_NR_set_thread_area:
+#ifdef TARGET_MIPS
+      ((CPUMIPSState *) cpu_env)->tls_value = arg1;
+      ret = 0;
+      break;
+#else
+      goto unimplemented_nowarn;
+#endif
+#endif
+#ifdef TARGET_NR_get_thread_area
     case TARGET_NR_get_thread_area:
         goto unimplemented_nowarn;
 #endif
@@ -3975,10 +3987,17 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
     case TARGET_NR_getdomainname:
         goto unimplemented_nowarn;
 #endif
+
+#if defined(TARGET_NR_set_tid_address) && defined(__NR_set_tid_address)
+    case TARGET_NR_set_tid_address:
+      ret = get_errno(set_tid_address((int *) arg1));
+      break;
+#endif
+
     default:
     unimplemented:
         gemu_log("qemu: Unsupported syscall: %d\n", num);
-#if defined(TARGET_NR_setxattr) || defined(TARGET_NR_set_thread_area) || defined(TARGET_NR_getdomainname)
+#if defined(TARGET_NR_setxattr) || defined(TARGET_NR_get_thread_area) || defined(TARGET_NR_getdomainname)
     unimplemented_nowarn:
 #endif
         ret = -ENOSYS;