Skip to content

Q
qemu

openeuler / qemu

通知 10
Star 0
Fork 0
Q
qemu

体验新版 GitCode，发现更多精彩内容 >>

提交 32407103 编写于 作者: J j_mayer
浏览文件
操作

Convert syscall arguments and return value from long to int or target_long. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3241 c046a42c-6fe2-441c-8c8c-71466251a162
上级 9007f0ef
隐藏空白更改
内联 并排
Showing with 108 addition and 83 deletion
linux-user/qemu.h
浏览文件 @ 32407103
...@@ -126,10 +126,11 @@ int load_flt_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, ...@@ -126,10 +126,11 @@ int load_flt_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
void memcpy_to_target(target_ulong dest, const void *src, void memcpy_to_target(target_ulong dest, const void *src,
unsigned long len); unsigned long len);
void target_set_brk(target_ulong new_brk); void target_set_brk(target_ulong new_brk);
long do_brk(target_ulong new_brk); target_long do_brk(target_ulong new_brk);
void syscall_init(void); void syscall_init(void);
long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3, target_long do_syscall(void *cpu_env, int num, target_long arg1,
long arg4, long arg5, long arg6); target_long arg2, target_long arg3, target_long arg4,
target_long arg5, target_long arg6);
void gemu_log(const char *fmt, ...) __attribute__((format(printf,1,2))); void gemu_log(const char *fmt, ...) __attribute__((format(printf,1,2)));
extern CPUState *global_env; extern CPUState *global_env;
void cpu_loop(CPUState *env); void cpu_loop(CPUState *env);
......
linux-user/syscall.c
浏览文件 @ 32407103
...@@ -366,7 +366,7 @@ static inline int host_to_target_errno(int err) ...@@ -366,7 +366,7 @@ static inline int host_to_target_errno(int err)
return err; return err;
} }
static inline long get_errno(long ret) static inline target_long get_errno(target_long ret)
{ {
if (ret == -1) if (ret == -1)
return -host_to_target_errno(errno); return -host_to_target_errno(errno);
...@@ -374,9 +374,9 @@ static inline long get_errno(long ret) ...@@ -374,9 +374,9 @@ static inline long get_errno(long ret)
return ret; return ret;
} }
static inline int is_error(long ret) static inline int is_error(target_long ret)
{ {
return (unsigned long)ret >= (unsigned long)(-4096); return (target_ulong)ret >= (target_ulong)(-4096);
} }
static target_ulong target_brk; static target_ulong target_brk;
...@@ -387,10 +387,10 @@ void target_set_brk(target_ulong new_brk) ...@@ -387,10 +387,10 @@ void target_set_brk(target_ulong new_brk)
target_original_brk = target_brk = HOST_PAGE_ALIGN(new_brk); target_original_brk = target_brk = HOST_PAGE_ALIGN(new_brk);
} }
long do_brk(target_ulong new_brk) target_long do_brk(target_ulong new_brk)
{ {
target_ulong brk_page; target_ulong brk_page;
long mapped_addr; target_long mapped_addr;
int new_alloc_size; int new_alloc_size;
if (!new_brk) if (!new_brk)
...@@ -471,7 +471,7 @@ static inline void host_to_target_fds(target_long *target_fds, ...@@ -471,7 +471,7 @@ static inline void host_to_target_fds(target_long *target_fds,
#define HOST_HZ 100 #define HOST_HZ 100
#endif #endif
static inline long host_to_target_clock_t(long ticks) static inline target_long host_to_target_clock_t(long ticks)
{ {
#if HOST_HZ == TARGET_HZ #if HOST_HZ == TARGET_HZ
return ticks; return ticks;
...@@ -530,15 +530,15 @@ static inline void host_to_target_timeval(target_ulong target_addr, ...@@ -530,15 +530,15 @@ static inline void host_to_target_timeval(target_ulong target_addr,
} }
static long do_select(long n, static target_long do_select(int n,
target_ulong rfd_p, target_ulong wfd_p, target_ulong rfd_p, target_ulong wfd_p,
target_ulong efd_p, target_ulong target_tv) target_ulong efd_p, target_ulong target_tv)
{ {
fd_set rfds, wfds, efds; fd_set rfds, wfds, efds;
fd_set *rfds_ptr, *wfds_ptr, *efds_ptr; fd_set *rfds_ptr, *wfds_ptr, *efds_ptr;
target_long *target_rfds, *target_wfds, *target_efds; target_long *target_rfds, *target_wfds, *target_efds;
struct timeval tv, *tv_ptr; struct timeval tv, *tv_ptr;
long ret; target_long ret;
int ok; int ok;
if (rfd_p) { if (rfd_p) {
...@@ -704,10 +704,11 @@ static inline void host_to_target_cmsg(struct target_msghdr *target_msgh, ...@@ -704,10 +704,11 @@ static inline void host_to_target_cmsg(struct target_msghdr *target_msgh,
msgh->msg_controllen = tswapl(space); msgh->msg_controllen = tswapl(space);
} }
static long do_setsockopt(int sockfd, int level, int optname, static target_long do_setsockopt(int sockfd, int level, int optname,
target_ulong optval, socklen_t optlen) target_ulong optval, socklen_t optlen)
{ {
int val, ret; target_long ret;
int val;
switch(level) { switch(level) {
case SOL_TCP: case SOL_TCP:
...@@ -824,10 +825,11 @@ static long do_setsockopt(int sockfd, int level, int optname, ...@@ -824,10 +825,11 @@ static long do_setsockopt(int sockfd, int level, int optname,
return ret; return ret;
} }
static long do_getsockopt(int sockfd, int level, int optname, static target_long do_getsockopt(int sockfd, int level, int optname,
target_ulong optval, target_ulong optlen) target_ulong optval, target_ulong optlen)
{ {
int len, lv, val, ret; target_long ret;
int len, lv, val;
switch(level) { switch(level) {
case TARGET_SOL_SOCKET: case TARGET_SOL_SOCKET:
...@@ -943,7 +945,7 @@ static void unlock_iovec(struct iovec *vec, target_ulong target_addr, ...@@ -943,7 +945,7 @@ static void unlock_iovec(struct iovec *vec, target_ulong target_addr,
unlock_user (target_vec, target_addr, 0); unlock_user (target_vec, target_addr, 0);
} }
static long do_socket(int domain, int type, int protocol) static target_long do_socket(int domain, int type, int protocol)
{ {
#if defined(TARGET_MIPS) #if defined(TARGET_MIPS)
switch(type) { switch(type) {
...@@ -970,8 +972,8 @@ static long do_socket(int domain, int type, int protocol) ...@@ -970,8 +972,8 @@ static long do_socket(int domain, int type, int protocol)
return get_errno(socket(domain, type, protocol)); return get_errno(socket(domain, type, protocol));
} }
static long do_bind(int sockfd, target_ulong target_addr, static target_long do_bind(int sockfd, target_ulong target_addr,
socklen_t addrlen) socklen_t addrlen)
{ {
void *addr = alloca(addrlen); void *addr = alloca(addrlen);
...@@ -979,8 +981,8 @@ static long do_bind(int sockfd, target_ulong target_addr, ...@@ -979,8 +981,8 @@ static long do_bind(int sockfd, target_ulong target_addr,
return get_errno(bind(sockfd, addr, addrlen)); return get_errno(bind(sockfd, addr, addrlen));
} }
static long do_connect(int sockfd, target_ulong target_addr, static target_long do_connect(int sockfd, target_ulong target_addr,
socklen_t addrlen) socklen_t addrlen)
{ {
void *addr = alloca(addrlen); void *addr = alloca(addrlen);
...@@ -988,10 +990,10 @@ static long do_connect(int sockfd, target_ulong target_addr, ...@@ -988,10 +990,10 @@ static long do_connect(int sockfd, target_ulong target_addr,
return get_errno(connect(sockfd, addr, addrlen)); return get_errno(connect(sockfd, addr, addrlen));
} }
static long do_sendrecvmsg(int fd, target_ulong target_msg, static target_long do_sendrecvmsg(int fd, target_ulong target_msg,
int flags, int send) int flags, int send)
{ {
long ret; target_long ret;
struct target_msghdr *msgp; struct target_msghdr *msgp;
struct msghdr msg; struct msghdr msg;
int count; int count;
...@@ -1031,12 +1033,12 @@ static long do_sendrecvmsg(int fd, target_ulong target_msg, ...@@ -1031,12 +1033,12 @@ static long do_sendrecvmsg(int fd, target_ulong target_msg,
return ret; return ret;
} }
static long do_accept(int fd, target_ulong target_addr, static target_long do_accept(int fd, target_ulong target_addr,
target_ulong target_addrlen) target_ulong target_addrlen)
{ {
socklen_t addrlen = tget32(target_addrlen); socklen_t addrlen = tget32(target_addrlen);
void *addr = alloca(addrlen); void *addr = alloca(addrlen);
long ret; target_long ret;
ret = get_errno(accept(fd, addr, &addrlen)); ret = get_errno(accept(fd, addr, &addrlen));
if (!is_error(ret)) { if (!is_error(ret)) {
...@@ -1046,12 +1048,12 @@ static long do_accept(int fd, target_ulong target_addr, ...@@ -1046,12 +1048,12 @@ static long do_accept(int fd, target_ulong target_addr,
return ret; return ret;
} }
static long do_getpeername(int fd, target_ulong target_addr, static target_long do_getpeername(int fd, target_ulong target_addr,
target_ulong target_addrlen) target_ulong target_addrlen)
{ {
socklen_t addrlen = tget32(target_addrlen); socklen_t addrlen = tget32(target_addrlen);
void *addr = alloca(addrlen); void *addr = alloca(addrlen);
long ret; target_long ret;
ret = get_errno(getpeername(fd, addr, &addrlen)); ret = get_errno(getpeername(fd, addr, &addrlen));
if (!is_error(ret)) { if (!is_error(ret)) {
...@@ -1061,12 +1063,12 @@ static long do_getpeername(int fd, target_ulong target_addr, ...@@ -1061,12 +1063,12 @@ static long do_getpeername(int fd, target_ulong target_addr,
return ret; return ret;
} }
static long do_getsockname(int fd, target_ulong target_addr, static target_long do_getsockname(int fd, target_ulong target_addr,
target_ulong target_addrlen) target_ulong target_addrlen)
{ {
socklen_t addrlen = tget32(target_addrlen); socklen_t addrlen = tget32(target_addrlen);
void *addr = alloca(addrlen); void *addr = alloca(addrlen);
long ret; target_long ret;
ret = get_errno(getsockname(fd, addr, &addrlen)); ret = get_errno(getsockname(fd, addr, &addrlen));
if (!is_error(ret)) { if (!is_error(ret)) {
...@@ -1076,11 +1078,11 @@ static long do_getsockname(int fd, target_ulong target_addr, ...@@ -1076,11 +1078,11 @@ static long do_getsockname(int fd, target_ulong target_addr,
return ret; return ret;
} }
static long do_socketpair(int domain, int type, int protocol, static target_long do_socketpair(int domain, int type, int protocol,
target_ulong target_tab) target_ulong target_tab)
{ {
int tab[2]; int tab[2];
long ret; target_long ret;
ret = get_errno(socketpair(domain, type, protocol, tab)); ret = get_errno(socketpair(domain, type, protocol, tab));
if (!is_error(ret)) { if (!is_error(ret)) {
...@@ -1090,12 +1092,12 @@ static long do_socketpair(int domain, int type, int protocol, ...@@ -1090,12 +1092,12 @@ static long do_socketpair(int domain, int type, int protocol,
return ret; return ret;
} }
static long do_sendto(int fd, target_ulong msg, size_t len, int flags, static target_long do_sendto(int fd, target_ulong msg, size_t len, int flags,
target_ulong target_addr, socklen_t addrlen) target_ulong target_addr, socklen_t addrlen)
{ {
void *addr; void *addr;
void *host_msg; void *host_msg;
long ret; target_long ret;
host_msg = lock_user(msg, len, 1); host_msg = lock_user(msg, len, 1);
if (target_addr) { if (target_addr) {
...@@ -1109,13 +1111,14 @@ static long do_sendto(int fd, target_ulong msg, size_t len, int flags, ...@@ -1109,13 +1111,14 @@ static long do_sendto(int fd, target_ulong msg, size_t len, int flags,
return ret; return ret;
} }
static long do_recvfrom(int fd, target_ulong msg, size_t len, int flags, static target_long do_recvfrom(int fd, target_ulong msg, size_t len, int flags,
target_ulong target_addr, target_ulong target_addrlen) target_ulong target_addr,
target_ulong target_addrlen)
{ {
socklen_t addrlen; socklen_t addrlen;
void *addr; void *addr;
void *host_msg; void *host_msg;
long ret; target_long ret;
host_msg = lock_user(msg, len, 0); host_msg = lock_user(msg, len, 0);
if (target_addr) { if (target_addr) {
...@@ -1138,9 +1141,10 @@ static long do_recvfrom(int fd, target_ulong msg, size_t len, int flags, ...@@ -1138,9 +1141,10 @@ static long do_recvfrom(int fd, target_ulong msg, size_t len, int flags,
return ret; return ret;
} }
static long do_socketcall(int num, target_ulong vptr) #ifdef TARGET_NR_socketcall
static target_long do_socketcall(int num, target_ulong vptr)
{ {
long ret; target_long ret;
const int n = sizeof(target_ulong); const int n = sizeof(target_ulong);
switch(num) { switch(num) {
...@@ -1300,7 +1304,9 @@ static long do_socketcall(int num, target_ulong vptr) ...@@ -1300,7 +1304,9 @@ static long do_socketcall(int num, target_ulong vptr)
} }
return ret; return ret;
} }
#endif
#ifdef TARGET_NR_ipc
#define N_SHM_REGIONS 32 #define N_SHM_REGIONS 32
static struct shm_region { static struct shm_region {
...@@ -1407,7 +1413,7 @@ union target_semun { ...@@ -1407,7 +1413,7 @@ union target_semun {
unsigned short int *array; unsigned short int *array;
}; };
static inline void target_to_host_semun(unsigned long cmd, static inline void target_to_host_semun(int cmd,
union semun *host_su, union semun *host_su,
target_ulong target_addr, target_ulong target_addr,
struct semid_ds *ds) struct semid_ds *ds)
...@@ -1439,7 +1445,7 @@ static inline void target_to_host_semun(unsigned long cmd, ...@@ -1439,7 +1445,7 @@ static inline void target_to_host_semun(unsigned long cmd,
} }
} }
static inline void host_to_target_semun(unsigned long cmd, static inline void host_to_target_semun(int cmd,
target_ulong target_addr, target_ulong target_addr,
union semun *host_su, union semun *host_su,
struct semid_ds *ds) struct semid_ds *ds)
...@@ -1470,12 +1476,13 @@ static inline void host_to_target_semun(unsigned long cmd, ...@@ -1470,12 +1476,13 @@ static inline void host_to_target_semun(unsigned long cmd,
} }
} }
static inline long do_semctl(long first, long second, long third, long ptr) static inline target_long do_semctl(int first, int second, int third,
target_long ptr)
{ {
union semun arg; union semun arg;
struct semid_ds dsarg; struct semid_ds dsarg;
int cmd = third&0xff; int cmd = third&0xff;
long ret = 0; target_long ret = 0;
switch( cmd ) { switch( cmd ) {
case GETVAL: case GETVAL:
...@@ -1534,7 +1541,7 @@ struct target_msqid_ds ...@@ -1534,7 +1541,7 @@ struct target_msqid_ds
}; };
static inline void target_to_host_msqid_ds(struct msqid_ds *host_md, static inline void target_to_host_msqid_ds(struct msqid_ds *host_md,
target_ulong target_addr) target_ulong target_addr)
{ {
struct target_msqid_ds *target_md; struct target_msqid_ds *target_md;
...@@ -1569,11 +1576,11 @@ static inline void host_to_target_msqid_ds(target_ulong target_addr, ...@@ -1569,11 +1576,11 @@ static inline void host_to_target_msqid_ds(target_ulong target_addr,
unlock_user_struct(target_md, target_addr, 1); unlock_user_struct(target_md, target_addr, 1);
} }
static inline long do_msgctl(long first, long second, long ptr) static inline target_long do_msgctl(int first, int second, target_long ptr)
{ {
struct msqid_ds dsarg; struct msqid_ds dsarg;
int cmd = second&0xff; int cmd = second&0xff;
long ret = 0; target_long ret = 0;
switch( cmd ) { switch( cmd ) {
case IPC_STAT: case IPC_STAT:
case IPC_SET: case IPC_SET:
...@@ -1591,11 +1598,12 @@ struct target_msgbuf { ...@@ -1591,11 +1598,12 @@ struct target_msgbuf {
char mtext[1]; char mtext[1];
}; };
static inline long do_msgsnd(long msqid, long msgp, long msgsz, long msgflg) static inline target_long do_msgsnd(int msqid, target_long msgp,
unsigned int msgsz, int msgflg)
{ {
struct target_msgbuf *target_mb; struct target_msgbuf *target_mb;
struct msgbuf *host_mb; struct msgbuf *host_mb;
long ret = 0; target_long ret = 0;
lock_user_struct(target_mb,msgp,0); lock_user_struct(target_mb,msgp,0);
host_mb = malloc(msgsz+sizeof(long)); host_mb = malloc(msgsz+sizeof(long));
...@@ -1608,11 +1616,13 @@ static inline long do_msgsnd(long msqid, long msgp, long msgsz, long msgflg) ...@@ -1608,11 +1616,13 @@ static inline long do_msgsnd(long msqid, long msgp, long msgsz, long msgflg)
return ret; return ret;
} }
static inline long do_msgrcv(long msqid, long msgp, long msgsz, long msgtype, long msgflg) static inline target_long do_msgrcv(int msqid, target_long msgp,
unsigned int msgsz, int msgtype,
int msgflg)
{ {
struct target_msgbuf *target_mb; struct target_msgbuf *target_mb;
struct msgbuf *host_mb; struct msgbuf *host_mb;
long ret = 0; target_long ret = 0;
lock_user_struct(target_mb, msgp, 0); lock_user_struct(target_mb, msgp, 0);
host_mb = malloc(msgsz+sizeof(long)); host_mb = malloc(msgsz+sizeof(long));
...@@ -1627,11 +1637,12 @@ static inline long do_msgrcv(long msqid, long msgp, long msgsz, long msgtype, lo ...@@ -1627,11 +1637,12 @@ static inline long do_msgrcv(long msqid, long msgp, long msgsz, long msgtype, lo
} }
/* ??? This only works with linear mappings. */ /* ??? This only works with linear mappings. */
static long do_ipc(long call, long first, long second, long third, static target_long do_ipc(unsigned int call, int first,
long ptr, long fifth) int second, int third,
target_long ptr, target_long fifth)
{ {
int version; int version;
long ret = 0; target_long ret = 0;
unsigned long raddr; unsigned long raddr;
struct shmid_ds shm_info; struct shmid_ds shm_info;
int i; int i;
...@@ -1653,7 +1664,7 @@ static long do_ipc(long call, long first, long second, long third, ...@@ -1653,7 +1664,7 @@ static long do_ipc(long call, long first, long second, long third,
break; break;
case IPCOP_semtimedop: case IPCOP_semtimedop:
gemu_log("Unsupported ipc call: %ld (version %d)\n", call, version); gemu_log("Unsupported ipc call: %d (version %d)\n", call, version);
ret = -ENOSYS; ret = -ENOSYS;
break; break;
...@@ -1709,7 +1720,7 @@ static long do_ipc(long call, long first, long second, long third, ...@@ -1709,7 +1720,7 @@ static long do_ipc(long call, long first, long second, long third,
break; break;
} }
} }
if (put_user(raddr, (uint32_t *)third)) if (put_user(raddr, (target_ulong *)third))
return -EFAULT; return -EFAULT;
ret = 0; ret = 0;
break; break;
...@@ -1743,12 +1754,13 @@ static long do_ipc(long call, long first, long second, long third, ...@@ -1743,12 +1754,13 @@ static long do_ipc(long call, long first, long second, long third,
break; break;
default: default:
unimplemented: unimplemented:
gemu_log("Unsupported ipc call: %ld (version %d)\n", call, version); gemu_log("Unsupported ipc call: %d (version %d)\n", call, version);
ret = -ENOSYS; ret = -ENOSYS;
break; break;
} }
return ret; return ret;
} }
#endif
/* kernel structure types definitions */ /* kernel structure types definitions */
#define IFNAMSIZ 16 #define IFNAMSIZ 16
...@@ -1789,11 +1801,11 @@ IOCTLEntry ioctl_entries[] = { ...@@ -1789,11 +1801,11 @@ IOCTLEntry ioctl_entries[] = {
}; };
/* ??? Implement proper locking for ioctls. */ /* ??? Implement proper locking for ioctls. */
static long do_ioctl(long fd, long cmd, long arg) static target_long do_ioctl(int fd, target_long cmd, target_long arg)
{ {
const IOCTLEntry *ie; const IOCTLEntry *ie;
const argtype *arg_type; const argtype *arg_type;
long ret; target_long ret;
uint8_t buf_temp[MAX_STRUCT_SIZE]; uint8_t buf_temp[MAX_STRUCT_SIZE];
int target_size; int target_size;
void *argptr; void *argptr;
...@@ -1801,7 +1813,7 @@ static long do_ioctl(long fd, long cmd, long arg) ...@@ -1801,7 +1813,7 @@ static long do_ioctl(long fd, long cmd, long arg)
ie = ioctl_entries; ie = ioctl_entries;
for(;;) { for(;;) {
if (ie->target_cmd == 0) { if (ie->target_cmd == 0) {
gemu_log("Unsupported ioctl: cmd=0x%04lx\n", cmd); gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd);
return -ENOSYS; return -ENOSYS;
} }
if (ie->target_cmd == cmd) if (ie->target_cmd == cmd)
...@@ -1810,7 +1822,7 @@ static long do_ioctl(long fd, long cmd, long arg) ...@@ -1810,7 +1822,7 @@ static long do_ioctl(long fd, long cmd, long arg)
} }
arg_type = ie->arg_type; arg_type = ie->arg_type;
#if defined(DEBUG) #if defined(DEBUG)
gemu_log("ioctl: cmd=0x%04lx (%s)\n", cmd, ie->name); gemu_log("ioctl: cmd=0x%04lx (%s)\n", (long)cmd, ie->name);
#endif #endif
switch(arg_type[0]) { switch(arg_type[0]) {
case TYPE_NULL: case TYPE_NULL:
...@@ -1855,7 +1867,8 @@ static long do_ioctl(long fd, long cmd, long arg) ...@@ -1855,7 +1867,8 @@ static long do_ioctl(long fd, long cmd, long arg)
} }
break; break;
default: default:
gemu_log("Unsupported ioctl type: cmd=0x%04lx type=%d\n", cmd, arg_type[0]); gemu_log("Unsupported ioctl type: cmd=0x%04lx type=%d\n",
(long)cmd, arg_type[0]);
ret = -ENOSYS; ret = -ENOSYS;
break; break;
} }
...@@ -2205,7 +2218,7 @@ static int clone_func(void *arg) ...@@ -2205,7 +2218,7 @@ static int clone_func(void *arg)
return 0; return 0;
} }
int do_fork(CPUState *env, unsigned int flags, unsigned long newsp) int do_fork(CPUState *env, unsigned int flags, target_ulong newsp)
{ {
int ret; int ret;
TaskState *ts; TaskState *ts;
...@@ -2291,13 +2304,13 @@ int do_fork(CPUState *env, unsigned int flags, unsigned long newsp) ...@@ -2291,13 +2304,13 @@ int do_fork(CPUState *env, unsigned int flags, unsigned long newsp)
return ret; return ret;
} }
static long do_fcntl(int fd, int cmd, target_ulong arg) static target_long do_fcntl(int fd, int cmd, target_ulong arg)
{ {
struct flock fl; struct flock fl;
struct target_flock *target_fl; struct target_flock *target_fl;
struct flock64 fl64; struct flock64 fl64;
struct target_flock64 *target_fl64; struct target_flock64 *target_fl64;
long ret; target_long ret;
switch(cmd) { switch(cmd) {
case TARGET_F_GETLK: case TARGET_F_GETLK:
...@@ -2456,6 +2469,7 @@ void syscall_init(void) ...@@ -2456,6 +2469,7 @@ void syscall_init(void)
} }
} }
#if TARGET_LONG_BITS == 32
static inline uint64_t target_offset64(uint32_t word0, uint32_t word1) static inline uint64_t target_offset64(uint32_t word0, uint32_t word1)
{ {
#ifdef TARGET_WORDS_BIG_ENDIAN #ifdef TARGET_WORDS_BIG_ENDIAN
...@@ -2464,10 +2478,18 @@ static inline uint64_t target_offset64(uint32_t word0, uint32_t word1) ...@@ -2464,10 +2478,18 @@ static inline uint64_t target_offset64(uint32_t word0, uint32_t word1)
return ((uint64_t)word1 << 32) | word0; return ((uint64_t)word1 << 32) | word0;
#endif #endif
} }
#else /* TARGET_LONG_BITS == 32 */
static inline uint64_t target_offset64(uint64_t word0, uint64_t word1)
{
return word0;
}
#endif /* TARGET_LONG_BITS != 32 */
#ifdef TARGET_NR_truncate64 #ifdef TARGET_NR_truncate64
static inline long target_truncate64(void *cpu_env, const char *arg1, static inline target_long target_truncate64(void *cpu_env, const char *arg1,
long arg2, long arg3, long arg4) target_long arg2,
target_long arg3,
target_long arg4)
{ {
#ifdef TARGET_ARM #ifdef TARGET_ARM
if (((CPUARMState *)cpu_env)->eabi) if (((CPUARMState *)cpu_env)->eabi)
...@@ -2481,8 +2503,10 @@ static inline long target_truncate64(void *cpu_env, const char *arg1, ...@@ -2481,8 +2503,10 @@ static inline long target_truncate64(void *cpu_env, const char *arg1,
#endif #endif
#ifdef TARGET_NR_ftruncate64 #ifdef TARGET_NR_ftruncate64
static inline long target_ftruncate64(void *cpu_env, long arg1, long arg2, static inline target_long target_ftruncate64(void *cpu_env, target_long arg1,
long arg3, long arg4) target_long arg2,
target_long arg3,
target_long arg4)
{ {
#ifdef TARGET_ARM #ifdef TARGET_ARM
if (((CPUARMState *)cpu_env)->eabi) if (((CPUARMState *)cpu_env)->eabi)
...@@ -2517,10 +2541,11 @@ static inline void host_to_target_timespec(target_ulong target_addr, ...@@ -2517,10 +2541,11 @@ static inline void host_to_target_timespec(target_ulong target_addr,
unlock_user_struct(target_ts, target_addr, 1); unlock_user_struct(target_ts, target_addr, 1);
} }
long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3, target_long do_syscall(void *cpu_env, int num, target_long arg1,
long arg4, long arg5, long arg6) target_long arg2, target_long arg3, target_long arg4,
target_long arg5, target_long arg6)
{ {
long ret; target_long ret;
struct stat st; struct stat st;
struct statfs stfs; struct statfs stfs;
void *p; void *p;
...@@ -4018,7 +4043,7 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3, ...@@ -4018,7 +4043,7 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
{ {
struct target_dirent *target_dirp; struct target_dirent *target_dirp;
struct dirent *dirp; struct dirent *dirp;
long count = arg3; target_long count = arg3;
dirp = malloc(count); dirp = malloc(count);
if (!dirp) if (!dirp)
...@@ -4060,7 +4085,7 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3, ...@@ -4060,7 +4085,7 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
#else #else
{ {
struct dirent *dirp; struct dirent *dirp;
long count = arg3; target_long count = arg3;
dirp = lock_user(arg2, count, 0); dirp = lock_user(arg2, count, 0);
ret = get_errno(sys_getdents(arg1, dirp, count)); ret = get_errno(sys_getdents(arg1, dirp, count));
...@@ -4088,7 +4113,7 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3, ...@@ -4088,7 +4113,7 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
case TARGET_NR_getdents64: case TARGET_NR_getdents64:
{ {
struct dirent64 *dirp; struct dirent64 *dirp;
long count = arg3; target_long count = arg3;
dirp = lock_user(arg2, count, 0); dirp = lock_user(arg2, count, 0);
ret = get_errno(sys_getdents64(arg1, dirp, count)); ret = get_errno(sys_getdents64(arg1, dirp, count));
if (!is_error(ret)) { if (!is_error(ret)) {
...@@ -4941,4 +4966,3 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3, ...@@ -4941,4 +4966,3 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
#endif #endif
return ret; return ret;
} }
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或