[Qemu-devel] [6210] CRIS: Implement set_thread_area for CRIS.

[Edgar E. Iglesias]

Revision: 6210
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6210
Author:   edgar_igl
Date:     2009-01-07 14:19:38 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
CRIS: Implement set_thread_area for CRIS.

Signed-off-by: Edgar E. Iglesias <address@hidden>

Modified Paths:
--------------
    trunk/linux-user/syscall.c
    trunk/target-cris/cpu.h
    trunk/tests/cris/Makefile

Added Paths:
-----------
    trunk/tests/cris/check_settls1.c

Modified: trunk/linux-user/syscall.c
===================================================================
--- trunk/linux-user/syscall.c  2009-01-07 14:00:33 UTC (rev 6209)
+++ trunk/linux-user/syscall.c  2009-01-07 14:19:38 UTC (rev 6210)
@@ -5912,6 +5912,14 @@
       ((CPUMIPSState *) cpu_env)->tls_value = arg1;
       ret = 0;
       break;
+#elif defined(TARGET_CRIS)
+      if (arg1 & 0xff)
+          ret = -TARGET_EINVAL;
+      else {
+          ((CPUCRISState *) cpu_env)->pregs[PR_PID] = arg1;
+          ret = 0;
+      }
+      break;
 #elif defined(TARGET_I386) && defined(TARGET_ABI32)
       ret = do_set_thread_area(cpu_env, arg1);
       break;

Modified: trunk/target-cris/cpu.h
===================================================================
--- trunk/target-cris/cpu.h     2009-01-07 14:00:33 UTC (rev 6209)
+++ trunk/target-cris/cpu.h     2009-01-07 14:19:38 UTC (rev 6210)
@@ -225,6 +225,11 @@
 }
 #endif
 
+static inline void cpu_set_tls(CPUCRISState *env, target_ulong newtls)
+{
+       env->pregs[PR_PID] = (env->pregs[PR_PID] & 0xff) | newtls;
+}
+
 /* Support function regs.  */
 #define SFR_RW_GC_CFG      0][0
 #define SFR_RW_MM_CFG      env->pregs[PR_SRS]][0

Modified: trunk/tests/cris/Makefile
===================================================================
--- trunk/tests/cris/Makefile   2009-01-07 14:00:33 UTC (rev 6209)
+++ trunk/tests/cris/Makefile   2009-01-07 14:19:38 UTC (rev 6210)
@@ -117,8 +117,8 @@
 TESTCASES += check_sigalrm.ctst
 TESTCASES += check_time1.ctst
 TESTCASES += check_time2.ctst
+TESTCASES += check_settls1.ctst
 
-
 TESTCASES += check_gcctorture_pr28634-1.ctst
 #TESTCASES += check_gcctorture_pr28634.ctst
 

Added: trunk/tests/cris/check_settls1.c
===================================================================
--- trunk/tests/cris/check_settls1.c                            (rev 0)
+++ trunk/tests/cris/check_settls1.c    2009-01-07 14:19:38 UTC (rev 6210)
@@ -0,0 +1,39 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <sys/syscall.h>
+
+#ifndef SYS_set_thread_area
+#define SYS_set_thread_area 243
+#endif
+
+int main (void)
+{
+    unsigned long tp;
+    int ret;
+
+    ret = syscall (SYS_set_thread_area, 0xf0);
+    if (ret != -1 || errno != EINVAL) {
+        perror ("Invalid thread area accepted:");
+        abort();
+    }
+
+    ret = syscall (SYS_set_thread_area, 0xeddeed00);
+    if (ret != 0) {
+        perror ("Valid thread area not accepted: ");
+        abort ();
+    }
+
+    asm ("move $pid,%0" : "=r" (tp));
+    tp &= ~0xff;
+
+    if (tp != 0xeddeed00) {
+        perror ("tls2");
+        abort ();
+    }
+
+    printf ("pass\n");
+    return EXIT_SUCCESS;
+}