Skip to content

Commit

Permalink
CRIS: Implement set_thread_area for CRIS.
Browse files Browse the repository at this point in the history
Signed-off-by: Edgar E. Iglesias <[email protected]>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6210 c046a42c-6fe2-441c-8c8c-71466251a162
  • Loading branch information
edgar_igl committed Jan 7, 2009
1 parent 35ef81d commit ef96779
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 1 deletion.
8 changes: 8 additions & 0 deletions linux-user/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -5912,6 +5912,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
((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;
Expand Down
5 changes: 5 additions & 0 deletions target-cris/cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,11 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
}
#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
Expand Down
2 changes: 1 addition & 1 deletion tests/cris/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ TESTCASES += check_mmap3.ctst
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
Expand Down
39 changes: 39 additions & 0 deletions tests/cris/check_settls1.c
Original file line number Diff line number Diff line change
@@ -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;
}

0 comments on commit ef96779

Please sign in to comment.