david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CRIS: Implement set_thread_area for CRIS.

Browse Source 
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6210 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
edgar_igl 2009-01-07 14:19:38 +00:00
parent 35ef81d6d2
commit ef96779bc3
4 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux-user/syscall.c
View File

@ -5912,6 +5912,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
((CPUMIPSState *) cpu_env)->tls_value = arg1; ((CPUMIPSState *) cpu_env)->tls_value = arg1;
ret = 0; ret = 0;
break; 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) #elif defined(TARGET_I386) && defined(TARGET_ABI32)
ret = do_set_thread_area(cpu_env, arg1); ret = do_set_thread_area(cpu_env, arg1);
break; break;

5
target-cris/cpu.h
View File

@ -225,6 +225,11 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
} }
#endif #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. */ /* Support function regs. */
#define SFR_RW_GC_CFG 0][0 #define SFR_RW_GC_CFG 0][0
#define SFR_RW_MM_CFG env->pregs[PR_SRS]][0 #define SFR_RW_MM_CFG env->pregs[PR_SRS]][0

2
tests/cris/Makefile
View File

@ -117,7 +117,7 @@ TESTCASES += check_mmap3.ctst
TESTCASES += check_sigalrm.ctst TESTCASES += check_sigalrm.ctst
TESTCASES += check_time1.ctst TESTCASES += check_time1.ctst
TESTCASES += check_time2.ctst TESTCASES += check_time2.ctst
TESTCASES += check_settls1.ctst
TESTCASES += check_gcctorture_pr28634-1.ctst TESTCASES += check_gcctorture_pr28634-1.ctst
#TESTCASES += check_gcctorture_pr28634.ctst #TESTCASES += check_gcctorture_pr28634.ctst

39
tests/cris/check_settls1.c Normal file
View File

@ -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;
}