linux-user: Conditionalize syscalls which are not defined in tilegx

Some of architectures (e.g. tilegx), several syscall macros are not
supported, so switch them.

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <BLU436-SMTP457D6FC9B2B9BA87AEB22CB9660@phx.gbl>
Signed-off-by: Richard Henderson <rth@twiddle.net>
master
Chen Gang 2015-08-21 05:37:33 +08:00 committed by Richard Henderson
parent b16189b222
commit 704eff6c23
1 changed files with 49 additions and 1 deletions

View File

@ -213,7 +213,7 @@ static int gettid(void) {
return -ENOSYS; return -ENOSYS;
} }
#endif #endif
#ifdef __NR_getdents #if defined(TARGET_NR_getdents) && defined(__NR_getdents)
_syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count); _syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count);
#endif #endif
#if !defined(__NR_getdents) || \ #if !defined(__NR_getdents) || \
@ -5640,6 +5640,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
ret = get_errno(write(arg1, p, arg3)); ret = get_errno(write(arg1, p, arg3));
unlock_user(p, arg2, 0); unlock_user(p, arg2, 0);
break; break;
#ifdef TARGET_NR_open
case TARGET_NR_open: case TARGET_NR_open:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
@ -5648,6 +5649,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
arg3)); arg3));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#endif
case TARGET_NR_openat: case TARGET_NR_openat:
if (!(p = lock_user_string(arg2))) if (!(p = lock_user_string(arg2)))
goto efault; goto efault;
@ -5662,9 +5664,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_brk: case TARGET_NR_brk:
ret = do_brk(arg1); ret = do_brk(arg1);
break; break;
#ifdef TARGET_NR_fork
case TARGET_NR_fork: case TARGET_NR_fork:
ret = get_errno(do_fork(cpu_env, SIGCHLD, 0, 0, 0, 0)); ret = get_errno(do_fork(cpu_env, SIGCHLD, 0, 0, 0, 0));
break; break;
#endif
#ifdef TARGET_NR_waitpid #ifdef TARGET_NR_waitpid
case TARGET_NR_waitpid: case TARGET_NR_waitpid:
{ {
@ -5699,6 +5703,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#endif #endif
#ifdef TARGET_NR_link
case TARGET_NR_link: case TARGET_NR_link:
{ {
void * p2; void * p2;
@ -5712,6 +5717,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
} }
break; break;
#endif
#if defined(TARGET_NR_linkat) #if defined(TARGET_NR_linkat)
case TARGET_NR_linkat: case TARGET_NR_linkat:
{ {
@ -5729,12 +5735,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
break; break;
#endif #endif
#ifdef TARGET_NR_unlink
case TARGET_NR_unlink: case TARGET_NR_unlink:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(unlink(p)); ret = get_errno(unlink(p));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#endif
#if defined(TARGET_NR_unlinkat) #if defined(TARGET_NR_unlinkat)
case TARGET_NR_unlinkat: case TARGET_NR_unlinkat:
if (!(p = lock_user_string(arg2))) if (!(p = lock_user_string(arg2)))
@ -5851,12 +5859,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
break; break;
#endif #endif
#ifdef TARGET_NR_mknod
case TARGET_NR_mknod: case TARGET_NR_mknod:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(mknod(p, arg2, arg3)); ret = get_errno(mknod(p, arg2, arg3));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#endif
#if defined(TARGET_NR_mknodat) #if defined(TARGET_NR_mknodat)
case TARGET_NR_mknodat: case TARGET_NR_mknodat:
if (!(p = lock_user_string(arg2))) if (!(p = lock_user_string(arg2)))
@ -5865,12 +5875,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
unlock_user(p, arg2, 0); unlock_user(p, arg2, 0);
break; break;
#endif #endif
#ifdef TARGET_NR_chmod
case TARGET_NR_chmod: case TARGET_NR_chmod:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(chmod(p, arg2)); ret = get_errno(chmod(p, arg2));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#endif
#ifdef TARGET_NR_break #ifdef TARGET_NR_break
case TARGET_NR_break: case TARGET_NR_break:
goto unimplemented; goto unimplemented;
@ -6005,6 +6017,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
break; break;
#endif #endif
#ifdef TARGET_NR_utimes
case TARGET_NR_utimes: case TARGET_NR_utimes:
{ {
struct timeval *tvp, tv[2]; struct timeval *tvp, tv[2];
@ -6023,6 +6036,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
} }
break; break;
#endif
#if defined(TARGET_NR_futimesat) #if defined(TARGET_NR_futimesat)
case TARGET_NR_futimesat: case TARGET_NR_futimesat:
{ {
@ -6051,12 +6065,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_gtty: case TARGET_NR_gtty:
goto unimplemented; goto unimplemented;
#endif #endif
#ifdef TARGET_NR_access
case TARGET_NR_access: case TARGET_NR_access:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(access(path(p), arg2)); ret = get_errno(access(path(p), arg2));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#endif
#if defined(TARGET_NR_faccessat) && defined(__NR_faccessat) #if defined(TARGET_NR_faccessat) && defined(__NR_faccessat)
case TARGET_NR_faccessat: case TARGET_NR_faccessat:
if (!(p = lock_user_string(arg2))) if (!(p = lock_user_string(arg2)))
@ -6081,6 +6097,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_kill: case TARGET_NR_kill:
ret = get_errno(kill(arg1, target_to_host_signal(arg2))); ret = get_errno(kill(arg1, target_to_host_signal(arg2)));
break; break;
#ifdef TARGET_NR_rename
case TARGET_NR_rename: case TARGET_NR_rename:
{ {
void *p2; void *p2;
@ -6094,6 +6111,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
} }
break; break;
#endif
#if defined(TARGET_NR_renameat) #if defined(TARGET_NR_renameat)
case TARGET_NR_renameat: case TARGET_NR_renameat:
{ {
@ -6109,12 +6127,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
break; break;
#endif #endif
#ifdef TARGET_NR_mkdir
case TARGET_NR_mkdir: case TARGET_NR_mkdir:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(mkdir(p, arg2)); ret = get_errno(mkdir(p, arg2));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#endif
#if defined(TARGET_NR_mkdirat) #if defined(TARGET_NR_mkdirat)
case TARGET_NR_mkdirat: case TARGET_NR_mkdirat:
if (!(p = lock_user_string(arg2))) if (!(p = lock_user_string(arg2)))
@ -6123,18 +6143,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
unlock_user(p, arg2, 0); unlock_user(p, arg2, 0);
break; break;
#endif #endif
#ifdef TARGET_NR_rmdir
case TARGET_NR_rmdir: case TARGET_NR_rmdir:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(rmdir(p)); ret = get_errno(rmdir(p));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#endif
case TARGET_NR_dup: case TARGET_NR_dup:
ret = get_errno(dup(arg1)); ret = get_errno(dup(arg1));
break; break;
#ifdef TARGET_NR_pipe
case TARGET_NR_pipe: case TARGET_NR_pipe:
ret = do_pipe(cpu_env, arg1, 0, 0); ret = do_pipe(cpu_env, arg1, 0, 0);
break; break;
#endif
#ifdef TARGET_NR_pipe2 #ifdef TARGET_NR_pipe2
case TARGET_NR_pipe2: case TARGET_NR_pipe2:
ret = do_pipe(cpu_env, arg1, ret = do_pipe(cpu_env, arg1,
@ -6219,11 +6243,15 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
ret = get_errno(chroot(p)); ret = get_errno(chroot(p));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#ifdef TARGET_NR_ustat
case TARGET_NR_ustat: case TARGET_NR_ustat:
goto unimplemented; goto unimplemented;
#endif
#ifdef TARGET_NR_dup2
case TARGET_NR_dup2: case TARGET_NR_dup2:
ret = get_errno(dup2(arg1, arg2)); ret = get_errno(dup2(arg1, arg2));
break; break;
#endif
#if defined(CONFIG_DUP3) && defined(TARGET_NR_dup3) #if defined(CONFIG_DUP3) && defined(TARGET_NR_dup3)
case TARGET_NR_dup3: case TARGET_NR_dup3:
ret = get_errno(dup3(arg1, arg2, arg3)); ret = get_errno(dup3(arg1, arg2, arg3));
@ -6234,9 +6262,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
ret = get_errno(getppid()); ret = get_errno(getppid());
break; break;
#endif #endif
#ifdef TARGET_NR_getpgrp
case TARGET_NR_getpgrp: case TARGET_NR_getpgrp:
ret = get_errno(getpgrp()); ret = get_errno(getpgrp());
break; break;
#endif
case TARGET_NR_setsid: case TARGET_NR_setsid:
ret = get_errno(setsid()); ret = get_errno(setsid());
break; break;
@ -6812,6 +6842,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
break; break;
#endif #endif
#ifdef TARGET_NR_symlink
case TARGET_NR_symlink: case TARGET_NR_symlink:
{ {
void *p2; void *p2;
@ -6825,6 +6856,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
} }
break; break;
#endif
#if defined(TARGET_NR_symlinkat) #if defined(TARGET_NR_symlinkat)
case TARGET_NR_symlinkat: case TARGET_NR_symlinkat:
{ {
@ -6844,6 +6876,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_oldlstat: case TARGET_NR_oldlstat:
goto unimplemented; goto unimplemented;
#endif #endif
#ifdef TARGET_NR_readlink
case TARGET_NR_readlink: case TARGET_NR_readlink:
{ {
void *p2; void *p2;
@ -6874,6 +6907,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
} }
break; break;
#endif
#if defined(TARGET_NR_readlinkat) #if defined(TARGET_NR_readlinkat)
case TARGET_NR_readlinkat: case TARGET_NR_readlinkat:
{ {
@ -7273,22 +7307,28 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
} }
break; break;
#ifdef TARGET_NR_stat
case TARGET_NR_stat: case TARGET_NR_stat:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(stat(path(p), &st)); ret = get_errno(stat(path(p), &st));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
goto do_stat; goto do_stat;
#endif
#ifdef TARGET_NR_lstat
case TARGET_NR_lstat: case TARGET_NR_lstat:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(lstat(path(p), &st)); ret = get_errno(lstat(path(p), &st));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
goto do_stat; goto do_stat;
#endif
case TARGET_NR_fstat: case TARGET_NR_fstat:
{ {
ret = get_errno(fstat(arg1, &st)); ret = get_errno(fstat(arg1, &st));
#if defined(TARGET_NR_stat) || defined(TARGET_NR_lstat)
do_stat: do_stat:
#endif
if (!is_error(ret)) { if (!is_error(ret)) {
struct target_stat *target_st; struct target_stat *target_st;
@ -7576,6 +7616,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
break; break;
#endif #endif
#ifdef TARGET_NR_getdents
case TARGET_NR_getdents: case TARGET_NR_getdents:
#ifdef __NR_getdents #ifdef __NR_getdents
#if TARGET_ABI_BITS == 32 && HOST_LONG_BITS == 64 #if TARGET_ABI_BITS == 32 && HOST_LONG_BITS == 64
@ -7706,6 +7747,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
#endif #endif
break; break;
#endif /* TARGET_NR_getdents */
#if defined(TARGET_NR_getdents64) && defined(__NR_getdents64) #if defined(TARGET_NR_getdents64) && defined(__NR_getdents64)
case TARGET_NR_getdents64: case TARGET_NR_getdents64:
{ {
@ -7845,11 +7887,13 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
ret = get_errno(fdatasync(arg1)); ret = get_errno(fdatasync(arg1));
break; break;
#endif #endif
#ifdef TARGET_NR__sysctl
case TARGET_NR__sysctl: case TARGET_NR__sysctl:
/* We don't implement this, but ENOTDIR is always a safe /* We don't implement this, but ENOTDIR is always a safe
return value. */ return value. */
ret = -TARGET_ENOTDIR; ret = -TARGET_ENOTDIR;
break; break;
#endif
case TARGET_NR_sched_getaffinity: case TARGET_NR_sched_getaffinity:
{ {
unsigned int mask_size; unsigned int mask_size;
@ -8296,12 +8340,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
ret = host_to_target_stat64(cpu_env, arg3, &st); ret = host_to_target_stat64(cpu_env, arg3, &st);
break; break;
#endif #endif
#ifdef TARGET_NR_lchown
case TARGET_NR_lchown: case TARGET_NR_lchown:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(lchown(p, low2highuid(arg2), low2highgid(arg3))); ret = get_errno(lchown(p, low2highuid(arg2), low2highgid(arg3)));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#endif
#ifdef TARGET_NR_getuid #ifdef TARGET_NR_getuid
case TARGET_NR_getuid: case TARGET_NR_getuid:
ret = get_errno(high2lowuid(getuid())); ret = get_errno(high2lowuid(getuid()));
@ -8424,12 +8470,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
break; break;
#endif #endif
#ifdef TARGET_NR_chown
case TARGET_NR_chown: case TARGET_NR_chown:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(chown(p, low2highuid(arg2), low2highgid(arg3))); ret = get_errno(chown(p, low2highuid(arg2), low2highgid(arg3)));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#endif
case TARGET_NR_setuid: case TARGET_NR_setuid:
ret = get_errno(setuid(low2highuid(arg1))); ret = get_errno(setuid(low2highuid(arg1)));
break; break;