linux-user: Use CPUArchState* instead of void* when possible
cover linux-user: Use CPUArchState* instead of void* when possible
From: Philippe Mathieu-Daudé <[email protected]>
Based-on: <[email protected]> "Abstract ArchCPU" pull request v2
Philippe Mathieu-Daudé (3):
linux-user/elfload: Remove pointless CPUArchState cast
linux-user: Have do_syscall() use CPUArchState* instead of void*
linux-user: Remove pointless CPU{ARCH}State casts
linux-user/elfload.c | 2 +- linux-user/strace.c | 202 ++++++++++++++++++------------------ linux-user/strace.h | 4 +- linux-user/syscall.c | 81 +++++++-------- linux-user/uname.c | 4 +- linux-user/uname.h | 2 +- linux-user/user-internals.h | 18 ++-- 7 files changed, 155 insertions(+), 158 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/3 linux-user/elfload: Remove pointless CPUArchState cast
From: Philippe Mathieu-Daudé <[email protected]>
fill_thread_info() takes a pointer to const.
--- linux-user/elfload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
linux-user/elfload.c +1 -1
@@ -3972,7 +3972,7 @@ static int fill_note_info(struct elf_note_info *info,if (cpu == thread_cpu) {continue ; } -fill_thread_info (info, (CPUArchState *)cpu->env_ptr); +fill_thread_info (info, cpu->env_ptr); }cpu_list_unlock ();
Signature · 1 line
2.34.1
Re: [PATCH 1/3] linux-user/elfload: Remove pointless CPUArchState cast
Quoted 1 line · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
Not sure if "Remove pointless non-const CPUArchState cast" as subject is clearer?
Quoted 20 lines
fill_thread_info()takes a pointer to const.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- linux-user/elfload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)linux-user/elfload.c +1
-1@@ -3972,7 +3972,7 @@ static int fill_note_info(struct elf_note_info *info,if (cpu == thread_cpu) {continue ; } -fill_thread_info (info, (CPUArchState *)cpu->env_ptr); +fill_thread_info (info, cpu->env_ptr); }cpu_list_unlock ();
PATCH 2/3 linux-user: Have do_syscall() use CPUArchState* instead of void*
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
--- linux-user/strace.c | 202 ++++++++++++++++++------------------ linux-user/strace.h | 4 +- linux-user/syscall.c | 32 +++--- linux-user/uname.c | 2 +- linux-user/uname.h | 2 +- linux-user/user-internals.h | 16 +-- 6 files changed, 129 insertions(+), 129 deletions(-)
linux-user/strace.c +101 -101
@@ -22,10 +22,10 @@ struct syscallname {int nr;const char *name;const char *format; -void (*call)(void *,const struct syscallname *, +void (*call)(CPUArchState *,const struct syscallname *,abi_long ,abi_long ,abi_long ,abi_long ,abi_long ,abi_long ); -void (*result)(void *,const struct syscallname *,abi_long , +void (*result)(CPUArchState *,const struct syscallname *,abi_long ,abi_long ,abi_long ,abi_long ,abi_long ,abi_long ,abi_long ); };
@@ -593,7 +593,7 @@ print_fdset(int n, abi_ulong target_fds_addr)/* select */ #ifdef TARGET_NR__newselectstatic void -print_newselect (void *cpu_env,const struct syscallname *name, +print_newselect (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6) {
@@ -611,7 +611,7 @@ print_newselect(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_semctlstatic void -print_semctl (void *cpu_env,const struct syscallname *name, +print_semctl (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6) {
@@ -623,7 +623,7 @@ print_semctl(void *cpu_env, const struct syscallname *name,#endif static void -print_execve (void *cpu_env,const struct syscallname *name, +print_execve (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6) {
@@ -656,7 +656,7 @@ print_execve(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_ipcstatic void -print_ipc (void *cpu_env,const struct syscallname *name, +print_ipc (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6) {
@@ -700,7 +700,7 @@ print_syscall_err(abi_long ret) }static void -print_syscall_ret_addr (void *cpu_env,const struct syscallname *name, +print_syscall_ret_addr (CPUArchState *cpu_env,const struct syscallname *name,abi_long ret,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5)
@@ -721,7 +721,7 @@ print_syscall_ret_raw(struct syscallname *name, abi_long ret)#ifdef TARGET_NR__newselectstatic void -print_syscall_ret_newselect (void *cpu_env,const struct syscallname *name, +print_syscall_ret_newselect (CPUArchState *cpu_env,const struct syscallname *name,abi_long ret,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5)
@@ -751,7 +751,7 @@ print_syscall_ret_newselect(void *cpu_env, const struct syscallname *name,#define TARGET_TIME_ERROR 5/* clock not synchronized */ #ifdef TARGET_NR_adjtimexstatic void -print_syscall_ret_adjtimex (void *cpu_env,const struct syscallname *name, +print_syscall_ret_adjtimex (CPUArchState *cpu_env,const struct syscallname *name,abi_long ret,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5)
@@ -786,7 +786,7 @@ print_syscall_ret_adjtimex(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_clock_gettime) || defined(TARGET_NR_clock_getres)static void -print_syscall_ret_clock_gettime (void *cpu_env,const struct syscallname *name, +print_syscall_ret_clock_gettime (CPUArchState *cpu_env,const struct syscallname *name,abi_long ret,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5)
@@ -805,7 +805,7 @@ print_syscall_ret_clock_gettime(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_gettimeofdaystatic void -print_syscall_ret_gettimeofday (void *cpu_env,const struct syscallname *name, +print_syscall_ret_gettimeofday (CPUArchState *cpu_env,const struct syscallname *name,abi_long ret,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5)
@@ -824,7 +824,7 @@ print_syscall_ret_gettimeofday(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_getitimerstatic void -print_syscall_ret_getitimer (void *cpu_env,const struct syscallname *name, +print_syscall_ret_getitimer (CPUArchState *cpu_env,const struct syscallname *name,abi_long ret,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5)
@@ -843,7 +843,7 @@ print_syscall_ret_getitimer(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_getitimerstatic void -print_syscall_ret_setitimer (void *cpu_env,const struct syscallname *name, +print_syscall_ret_setitimer (CPUArchState *cpu_env,const struct syscallname *name,abi_long ret,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5)
@@ -862,7 +862,7 @@ print_syscall_ret_setitimer(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_listxattr) || defined(TARGET_NR_llistxattr) \ || defined(TARGGET_NR_flistxattr)static void -print_syscall_ret_listxattr (void *cpu_env,const struct syscallname *name, +print_syscall_ret_listxattr (CPUArchState *cpu_env,const struct syscallname *name,abi_long ret,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5)
@@ -894,7 +894,7 @@ print_syscall_ret_listxattr(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_ioctlstatic void -print_syscall_ret_ioctl (void *cpu_env,const struct syscallname *name, +print_syscall_ret_ioctl (CPUArchState *cpu_env,const struct syscallname *name,abi_long ret,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5)
@@ -1760,7 +1760,7 @@ print_termios(void *arg)#ifdef TARGET_NR_acceptstatic void -print_accept (void *cpu_env,const struct syscallname *name, +print_accept (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1774,7 +1774,7 @@ print_accept(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_accessstatic void -print_access (void *cpu_env,const struct syscallname *name, +print_access (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1787,7 +1787,7 @@ print_access(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_acctstatic void -print_acct (void *cpu_env,const struct syscallname *name, +print_acct (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1799,7 +1799,7 @@ print_acct(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_brkstatic void -print_brk (void *cpu_env,const struct syscallname *name, +print_brk (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1811,7 +1811,7 @@ print_brk(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_chdirstatic void -print_chdir (void *cpu_env,const struct syscallname *name, +print_chdir (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1823,7 +1823,7 @@ print_chdir(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_chrootstatic void -print_chroot (void *cpu_env,const struct syscallname *name, +print_chroot (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1835,7 +1835,7 @@ print_chroot(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_chmodstatic void -print_chmod (void *cpu_env,const struct syscallname *name, +print_chmod (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1848,7 +1848,7 @@ print_chmod(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_chown) || defined(TARGET_NR_lchown)static void -print_chown (void *cpu_env,const struct syscallname *name, +print_chown (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1863,7 +1863,7 @@ print_chown(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_clock_adjtimestatic void -print_clock_adjtime (void *cpu_env,const struct syscallname *name, +print_clock_adjtime (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1887,7 +1887,7 @@ static void do_print_clone(unsigned int flags, abi_ulong newsp, }static void -print_clone (void *cpu_env,const struct syscallname *name, +print_clone (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6) {
@@ -1907,7 +1907,7 @@ print_clone(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_creatstatic void -print_creat (void *cpu_env,const struct syscallname *name, +print_creat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1920,7 +1920,7 @@ print_creat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_execvstatic void -print_execv (void *cpu_env,const struct syscallname *name, +print_execv (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1933,7 +1933,7 @@ print_execv(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_faccessatstatic void -print_faccessat (void *cpu_env,const struct syscallname *name, +print_faccessat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1948,7 +1948,7 @@ print_faccessat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_fallocatestatic void -print_fallocate (void *cpu_env,const struct syscallname *name, +print_fallocate (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1968,7 +1968,7 @@ print_fallocate(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_fchmodatstatic void -print_fchmodat (void *cpu_env,const struct syscallname *name, +print_fchmodat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1983,7 +1983,7 @@ print_fchmodat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_fchownatstatic void -print_fchownat (void *cpu_env,const struct syscallname *name, +print_fchownat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -1999,7 +1999,7 @@ print_fchownat(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_fcntl) || defined(TARGET_NR_fcntl64)static void -print_fcntl (void *cpu_env,const struct syscallname *name, +print_fcntl (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2135,7 +2135,7 @@ print_fcntl(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_fgetxattrstatic void -print_fgetxattr (void *cpu_env,const struct syscallname *name, +print_fgetxattr (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2150,7 +2150,7 @@ print_fgetxattr(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_flistxattrstatic void -print_flistxattr (void *cpu_env,const struct syscallname *name, +print_flistxattr (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2164,7 +2164,7 @@ print_flistxattr(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_getxattr) || defined(TARGET_NR_lgetxattr)static void -print_getxattr (void *cpu_env,const struct syscallname *name, +print_getxattr (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2180,7 +2180,7 @@ print_getxattr(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_listxattr) || defined(TARGET_NR_llistxattr)static void -print_listxattr (void *cpu_env,const struct syscallname *name, +print_listxattr (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2195,7 +2195,7 @@ print_listxattr(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_fremovexattr)static void -print_fremovexattr (void *cpu_env,const struct syscallname *name, +print_fremovexattr (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2208,7 +2208,7 @@ print_fremovexattr(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_removexattr) || defined(TARGET_NR_lremovexattr)static void -print_removexattr (void *cpu_env,const struct syscallname *name, +print_removexattr (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2222,7 +2222,7 @@ print_removexattr(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_futimesatstatic void -print_futimesat (void *cpu_env,const struct syscallname *name, +print_futimesat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2237,7 +2237,7 @@ print_futimesat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_gettimeofdaystatic void -print_gettimeofday (void *cpu_env,const struct syscallname *name, +print_gettimeofday (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2250,7 +2250,7 @@ print_gettimeofday(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_settimeofdaystatic void -print_settimeofday (void *cpu_env,const struct syscallname *name, +print_settimeofday (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2263,7 +2263,7 @@ print_settimeofday(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_clock_gettime) || defined(TARGET_NR_clock_getres)static void -print_clock_gettime (void *cpu_env,const struct syscallname *name, +print_clock_gettime (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2277,7 +2277,7 @@ print_clock_gettime(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_clock_settimestatic void -print_clock_settime (void *cpu_env,const struct syscallname *name, +print_clock_settime (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2290,7 +2290,7 @@ print_clock_settime(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_getitimerstatic void -print_getitimer (void *cpu_env,const struct syscallname *name, +print_getitimer (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2303,7 +2303,7 @@ print_getitimer(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_setitimerstatic void -print_setitimer (void *cpu_env,const struct syscallname *name, +print_setitimer (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2317,7 +2317,7 @@ print_setitimer(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_linkstatic void -print_link (void *cpu_env,const struct syscallname *name, +print_link (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2330,7 +2330,7 @@ print_link(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_linkatstatic void -print_linkat (void *cpu_env,const struct syscallname *name, +print_linkat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2346,7 +2346,7 @@ print_linkat(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR__llseek) || defined(TARGET_NR_llseek)static void -print__llseek (void *cpu_env,const struct syscallname *name, +print__llseek (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2369,7 +2369,7 @@ print__llseek(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_lseekstatic void -print_lseek (void *cpu_env,const struct syscallname *name, +print_lseek (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2400,7 +2400,7 @@ print_lseek(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_truncatestatic void -print_truncate (void *cpu_env,const struct syscallname *name, +print_truncate (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2413,7 +2413,7 @@ print_truncate(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_truncate64static void -print_truncate64 (void *cpu_env,const struct syscallname *name, +print_truncate64 (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2430,7 +2430,7 @@ print_truncate64(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_ftruncate64static void -print_ftruncate64 (void *cpu_env,const struct syscallname *name, +print_ftruncate64 (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2447,7 +2447,7 @@ print_ftruncate64(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_mlockallstatic void -print_mlockall (void *cpu_env,const struct syscallname *name, +print_mlockall (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2459,7 +2459,7 @@ print_mlockall(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_socket)static void -print_socket (void *cpu_env,const struct syscallname *name, +print_socket (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2920,7 +2920,7 @@ static struct { };static void -print_socketcall (void *cpu_env,const struct syscallname *name, +print_socketcall (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2941,7 +2941,7 @@ print_socketcall(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_bind)static void -print_bind (void *cpu_env,const struct syscallname *name, +print_bind (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2955,7 +2955,7 @@ print_bind(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_stat) || defined(TARGET_NR_stat64) || \ defined(TARGET_NR_lstat) || defined(TARGET_NR_lstat64)static void -print_stat (void *cpu_env,const struct syscallname *name, +print_stat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2971,7 +2971,7 @@ print_stat(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_fstat) || defined(TARGET_NR_fstat64)static void -print_fstat (void *cpu_env,const struct syscallname *name, +print_fstat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2985,7 +2985,7 @@ print_fstat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_mkdirstatic void -print_mkdir (void *cpu_env,const struct syscallname *name, +print_mkdir (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -2998,7 +2998,7 @@ print_mkdir(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_mkdiratstatic void -print_mkdirat (void *cpu_env,const struct syscallname *name, +print_mkdirat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3012,7 +3012,7 @@ print_mkdirat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_rmdirstatic void -print_rmdir (void *cpu_env,const struct syscallname *name, +print_rmdir (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3024,7 +3024,7 @@ print_rmdir(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_rt_sigactionstatic void -print_rt_sigaction (void *cpu_env,const struct syscallname *name, +print_rt_sigaction (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3038,7 +3038,7 @@ print_rt_sigaction(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_rt_sigprocmaskstatic void -print_rt_sigprocmask (void *cpu_env,const struct syscallname *name, +print_rt_sigprocmask (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3058,7 +3058,7 @@ print_rt_sigprocmask(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_rt_sigqueueinfostatic void -print_rt_sigqueueinfo (void *cpu_env,const struct syscallname *name, +print_rt_sigqueueinfo (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3083,7 +3083,7 @@ print_rt_sigqueueinfo(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_rt_tgsigqueueinfostatic void -print_rt_tgsigqueueinfo (void *cpu_env,const struct syscallname *name, +print_rt_tgsigqueueinfo (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3167,7 +3167,7 @@ print_syslog_action(abi_ulong arg, int last) }static void -print_syslog (void *cpu_env,const struct syscallname *name, +print_syslog (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3181,7 +3181,7 @@ print_syslog(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_mknodstatic void -print_mknod (void *cpu_env,const struct syscallname *name, +print_mknod (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3200,7 +3200,7 @@ print_mknod(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_mknodatstatic void -print_mknodat (void *cpu_env,const struct syscallname *name, +print_mknodat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3220,7 +3220,7 @@ print_mknodat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_mq_openstatic void -print_mq_open (void *cpu_env,const struct syscallname *name, +print_mq_open (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3239,7 +3239,7 @@ print_mq_open(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_openstatic void -print_open (void *cpu_env,const struct syscallname *name, +print_open (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3256,7 +3256,7 @@ print_open(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_openatstatic void -print_openat (void *cpu_env,const struct syscallname *name, +print_openat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3274,7 +3274,7 @@ print_openat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_mq_unlinkstatic void -print_mq_unlink (void *cpu_env,const struct syscallname *name, +print_mq_unlink (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3286,7 +3286,7 @@ print_mq_unlink(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_fstatat64) || defined(TARGET_NR_newfstatat)static void -print_fstatat64 (void *cpu_env,const struct syscallname *name, +print_fstatat64 (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3302,7 +3302,7 @@ print_fstatat64(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_readlinkstatic void -print_readlink (void *cpu_env,const struct syscallname *name, +print_readlink (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3316,7 +3316,7 @@ print_readlink(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_readlinkatstatic void -print_readlinkat (void *cpu_env,const struct syscallname *name, +print_readlinkat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3331,7 +3331,7 @@ print_readlinkat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_renamestatic void -print_rename (void *cpu_env,const struct syscallname *name, +print_rename (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3344,7 +3344,7 @@ print_rename(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_renameatstatic void -print_renameat (void *cpu_env,const struct syscallname *name, +print_renameat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3359,7 +3359,7 @@ print_renameat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_statfsstatic void -print_statfs (void *cpu_env,const struct syscallname *name, +print_statfs (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3372,7 +3372,7 @@ print_statfs(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_statfs64static void -print_statfs64 (void *cpu_env,const struct syscallname *name, +print_statfs64 (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3385,7 +3385,7 @@ print_statfs64(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_symlinkstatic void -print_symlink (void *cpu_env,const struct syscallname *name, +print_symlink (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3398,7 +3398,7 @@ print_symlink(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_symlinkatstatic void -print_symlinkat (void *cpu_env,const struct syscallname *name, +print_symlinkat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3412,7 +3412,7 @@ print_symlinkat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_mountstatic void -print_mount (void *cpu_env,const struct syscallname *name, +print_mount (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3428,7 +3428,7 @@ print_mount(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_umountstatic void -print_umount (void *cpu_env,const struct syscallname *name, +print_umount (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3440,7 +3440,7 @@ print_umount(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_umount2static void -print_umount2 (void *cpu_env,const struct syscallname *name, +print_umount2 (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3453,7 +3453,7 @@ print_umount2(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_unlinkstatic void -print_unlink (void *cpu_env,const struct syscallname *name, +print_unlink (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3465,7 +3465,7 @@ print_unlink(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_unlinkatstatic void -print_unlinkat (void *cpu_env,const struct syscallname *name, +print_unlinkat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3479,7 +3479,7 @@ print_unlinkat(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_unsharestatic void -print_unshare (void *cpu_env,const struct syscallname *name, +print_unshare (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3491,7 +3491,7 @@ print_unshare(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_utimestatic void -print_utime (void *cpu_env,const struct syscallname *name, +print_utime (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3504,7 +3504,7 @@ print_utime(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_utimesstatic void -print_utimes (void *cpu_env,const struct syscallname *name, +print_utimes (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3517,7 +3517,7 @@ print_utimes(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_utimensatstatic void -print_utimensat (void *cpu_env,const struct syscallname *name, +print_utimensat (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3532,7 +3532,7 @@ print_utimensat(void *cpu_env, const struct syscallname *name,#if defined(TARGET_NR_mmap) || defined(TARGET_NR_mmap2)static void -print_mmap (void *cpu_env,const struct syscallname *name, +print_mmap (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3550,7 +3550,7 @@ print_mmap(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_mprotectstatic void -print_mprotect (void *cpu_env,const struct syscallname *name, +print_mprotect (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3564,7 +3564,7 @@ print_mprotect(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_munmapstatic void -print_munmap (void *cpu_env,const struct syscallname *name, +print_munmap (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3617,7 +3617,7 @@ if( cmd == val ) { \ }static void -print_futex (void *cpu_env,const struct syscallname *name, +print_futex (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3634,7 +3634,7 @@ print_futex(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_killstatic void -print_kill (void *cpu_env,const struct syscallname *name, +print_kill (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3647,7 +3647,7 @@ print_kill(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_tkillstatic void -print_tkill (void *cpu_env,const struct syscallname *name, +print_tkill (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3660,7 +3660,7 @@ print_tkill(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_tgkillstatic void -print_tgkill (void *cpu_env,const struct syscallname *name, +print_tgkill (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3674,7 +3674,7 @@ print_tgkill(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_statxstatic void -print_statx (void *cpu_env,const struct syscallname *name, +print_statx (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3690,7 +3690,7 @@ print_statx(void *cpu_env, const struct syscallname *name,#ifdef TARGET_NR_ioctlstatic void -print_ioctl (void *cpu_env,const struct syscallname *name, +print_ioctl (CPUArchState *cpu_env,const struct syscallname *name,abi_long arg0,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5) {
@@ -3775,7 +3775,7 @@ static int nsyscalls = ARRAY_SIZE(scnames);* The public interface to this module. */ void -print_syscall (void *cpu_env,int num, +print_syscall (CPUArchState *cpu_env,int num,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6) {
@@ -3804,7 +3804,7 @@ print_syscall(void *cpu_env, int num,void -print_syscall_ret (void *cpu_env,int num,abi_long ret, +print_syscall_ret (CPUArchState *cpu_env,int num,abi_long ret,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6) {
linux-user/strace.h +2 -2
@@ -18,10 +18,10 @@#ifndef LINUX_USER_STRACE_H #define LINUX_USER_STRACE_H -void print_syscall (void *cpu_env,int num, +void print_syscall (CPUArchState *cpu_env,int num,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6); -void print_syscall_ret (void *cpu_env,int num,abi_long ret, +void print_syscall_ret (CPUArchState *cpu_env,int num,abi_long ret,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6);/**
linux-user/syscall.c +16 -16
@@ -1616,7 +1616,7 @@ static abi_long do_pipe2(int host_pipe[], int flags)#endif } -static abi_long do_pipe (void *cpu_env,abi_ulong pipedes, +static abi_long do_pipe (CPUArchState *cpu_env,abi_ulong pipedes,int flags,int is_pipe2) {int host_pipe[2 ];
@@ -7270,7 +7270,7 @@ void syscall_init(void) }#ifdef TARGET_NR_truncate64 -static inline abi_long target_truncate64 (void *cpu_env,const char *arg1, +static inline abi_long target_truncate64 (CPUArchState *cpu_env,const char *arg1,abi_long arg2,abi_long arg3,abi_long arg4)
@@ -7284,7 +7284,7 @@ static inline abi_long target_truncate64(void *cpu_env, const char *arg1,#endif #ifdef TARGET_NR_ftruncate64 -static inline abi_long target_ftruncate64 (void *cpu_env,abi_long arg1, +static inline abi_long target_ftruncate64 (CPUArchState *cpu_env,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4)
@@ -7579,7 +7579,7 @@ static inline int target_to_host_mlockall_arg(int arg)#if (defined(TARGET_NR_stat64) || defined(TARGET_NR_lstat64) || \ defined(TARGET_NR_fstat64) || defined(TARGET_NR_fstatat64) || \ defined(TARGET_NR_newfstatat)) -static inline abi_long host_to_target_stat64 (void *cpu_env, +static inline abi_long host_to_target_stat64 (CPUArchState *cpu_env,abi_ulong target_addr,struct stat *host_st) {
@@ -7981,7 +7981,7 @@ int host_to_target_waitstatus(int status)return status; } -static int open_self_cmdline (void *cpu_env,int fd) +static int open_self_cmdline (CPUArchState *cpu_env,int fd) {CPUState *cpu =env_cpu ((CPUArchState *)cpu_env);struct linux_binprm *bprm = ((TaskState *)cpu->opaque)->bprm;
@@ -7998,7 +7998,7 @@ static int open_self_cmdline(void *cpu_env, int fd)return 0 ; } -static int open_self_maps (void *cpu_env,int fd) +static int open_self_maps (CPUArchState *cpu_env,int fd) {CPUState *cpu =env_cpu ((CPUArchState *)cpu_env);TaskState *ts = cpu->opaque;
@@ -8060,7 +8060,7 @@ static int open_self_maps(void *cpu_env, int fd)return 0 ; } -static int open_self_stat (void *cpu_env,int fd) +static int open_self_stat (CPUArchState *cpu_env,int fd) {CPUState *cpu =env_cpu ((CPUArchState *)cpu_env);TaskState *ts = cpu->opaque;
@@ -8098,7 +8098,7 @@ static int open_self_stat(void *cpu_env, int fd)return 0 ; } -static int open_self_auxv (void *cpu_env,int fd) +static int open_self_auxv (CPUArchState *cpu_env,int fd) {CPUState *cpu =env_cpu ((CPUArchState *)cpu_env);TaskState *ts = cpu->opaque;
@@ -8161,7 +8161,7 @@ static int is_proc(const char *filename, const char *entry)#endif #if defined(HOST_WORDS_BIGENDIAN ) != defined(TARGET_WORDS_BIGENDIAN ) -static int open_net_route (void *cpu_env,int fd) +static int open_net_route (CPUArchState *cpu_env,int fd) {FILE *fp;char *line =NULL ;
@@ -8206,7 +8206,7 @@ static int open_net_route(void *cpu_env, int fd)#endif #if defined(TARGET_SPARC ) -static int open_cpuinfo (void *cpu_env,int fd) +static int open_cpuinfo (CPUArchState *cpu_env,int fd) {dprintf (fd,"type\t\t: sun4u\n" );return 0 ;
@@ -8214,7 +8214,7 @@ static int open_cpuinfo(void *cpu_env, int fd)#endif #if defined(TARGET_HPPA ) -static int open_cpuinfo (void *cpu_env,int fd) +static int open_cpuinfo (CPUArchState *cpu_env,int fd) {dprintf (fd,"cpu family\t: PA-RISC 1.1e\n" );dprintf (fd,"cpu\t\t: PA7300LC (PCX-L2)\n" );
@@ -8226,18 +8226,18 @@ static int open_cpuinfo(void *cpu_env, int fd)#endif #if defined(TARGET_M68K ) -static int open_hardware (void *cpu_env,int fd) +static int open_hardware (CPUArchState *cpu_env,int fd) {dprintf (fd,"Model:\t\tqemu-m68k\n" );return 0 ; }#endif -static int do_openat (void *cpu_env,int dirfd,const char *pathname,int flags,mode_t mode) +static int do_openat (CPUArchState *cpu_env,int dirfd,const char *pathname,int flags,mode_t mode) {struct fake_open {const char *filename; -int (*fill)(void *cpu_env,int fd); +int (*fill)(CPUArchState *cpu_env,int fd);int (*cmp)(const char *s1,const char *s2); };const struct fake_open *fake_open;
@@ -8549,7 +8549,7 @@ _syscall2(int, pivot_root, const char *, new_root, const char *, put_old)* of syscall results, can be performed. * All errnos that do_syscall() returns must be -TARGET_<errcode>. */ -static abi_long do_syscall1 (void *cpu_env,int num,abi_long arg1, +static abi_long do_syscall1 (CPUArchState *cpu_env,int num,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6,abi_long arg7,abi_long arg8)
@@ -13186,7 +13186,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,return ret; } -abi_long do_syscall (void *cpu_env,int num,abi_long arg1, +abi_long do_syscall (CPUArchState *cpu_env,int num,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6,abi_long arg7,abi_long arg8)
linux-user/uname.c +1 -1
@@ -29,7 +29,7 @@* NB: the default emulated CPU ("any") might not match any existing CPU, e.g. * on ARM it has all features turned on, so there is no perfect arch string to * return here */ -const char *cpu_to_uname_machine (void *cpu_env) +const char *cpu_to_uname_machine (CPUArchState *cpu_env) {#if defined(TARGET_ARM ) && !defined(TARGET_AARCH64 )
linux-user/uname.h +1 -1
@@ -4,7 +4,7 @@#include <sys/utsname.h> #include <linux/utsname.h> -const char *cpu_to_uname_machine (void *cpu_env); +const char *cpu_to_uname_machine (CPUArchState *cpu_env);int sys_uname (struct new_utsname *buf);#endif /* UNAME_H */
linux-user/user-internals.h +8 -8
@@ -59,7 +59,7 @@ int info_is_fdpic(struct image_info *info);void target_set_brk (abi_ulong new_brk);void syscall_init (void ); -abi_long do_syscall (void *cpu_env,int num,abi_long arg1, +abi_long do_syscall (CPUArchState *cpu_env,int num,abi_long arg1,abi_long arg2,abi_long arg3,abi_long arg4,abi_long arg5,abi_long arg6,abi_long arg7,abi_long arg8);
@@ -132,22 +132,22 @@ void print_termios(void *arg);/* ARM EABI and MIPS expect 64bit types aligned even on pairs or registers */ #ifdef TARGET_ARM -static inline int regpairs_aligned (void *cpu_env,int num) +static inline int regpairs_aligned (CPUArchState *cpu_env,int num) {return ((((CPUARMState *)cpu_env)->eabi) ==1 ) ; }#elif defined(TARGET_MIPS ) && (TARGET_ABI_BITS ==32 ) -static inline int regpairs_aligned (void *cpu_env,int num) {return 1 ; } +static inline int regpairs_aligned (CPUArchState *cpu_env,int num) {return 1 ; }#elif defined(TARGET_PPC ) && !defined(TARGET_PPC64 )/* * SysV AVI for PPC32 expects 64bit parameters to be passed on odd/even pairs * of registers which translates to the same as ARM/MIPS, because we start with * r3 as arg1 */ -static inline int regpairs_aligned (void *cpu_env,int num) {return 1 ; } +static inline int regpairs_aligned (CPUArchState *cpu_env,int num) {return 1 ; }#elif defined(TARGET_SH4 )/* SH4 doesn't align register pairs, except for p{read,write}64 */ -static inline int regpairs_aligned (void *cpu_env,int num) +static inline int regpairs_aligned (CPUArchState *cpu_env,int num) {switch (num) {case TARGET_NR_pread64:
@@ -159,11 +159,11 @@ static inline int regpairs_aligned(void *cpu_env, int num) } }#elif defined(TARGET_XTENSA) -static inline int regpairs_aligned (void *cpu_env,int num) {return 1 ; } +static inline int regpairs_aligned (CPUArchState *cpu_env,int num) {return 1 ; }#elif defined(TARGET_HEXAGON) -static inline int regpairs_aligned (void *cpu_env,int num) {return 1 ; } +static inline int regpairs_aligned (CPUArchState *cpu_env,int num) {return 1 ; }#else -static inline int regpairs_aligned (void *cpu_env,int num) {return 0 ; } +static inline int regpairs_aligned (CPUArchState *cpu_env,int num) {return 0 ; }#endif /**
Signature · 1 line
2.34.1
PATCH 3/3 linux-user: Remove pointless CPU{ARCH}State casts
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
--- linux-user/syscall.c | 49 +++++++++++++++++-------------------- linux-user/uname.c | 2 +- linux-user/user-internals.h | 2 +- 3 files changed, 25 insertions(+), 28 deletions(-)
linux-user/syscall.c +23 -26
@@ -1630,16 +1630,16 @@ static abi_long do_pipe(CPUArchState *cpu_env, abi_ulong pipedes,pipe syscall, but didn't replicate this into the pipe2 syscall. */ if (!is_pipe2) {#if defined(TARGET_ALPHA ) - ((CPUAlphaState *)cpu_env)->ir[IR_A4 ] = host_pipe[1 ]; + cpu_env->ir[IR_A4 ] = host_pipe[1 ];return host_pipe[0 ];#elif defined(TARGET_MIPS ) - ((CPUMIPSState *)cpu_env)->active_tc.gpr[3 ] = host_pipe[1 ]; + cpu_env->active_tc.gpr[3 ] = host_pipe[1 ];return host_pipe[0 ];#elif defined(TARGET_SH4 ) - ((CPUSH4State *)cpu_env)->gregs[1 ] = host_pipe[1 ]; + cpu_env->gregs[1 ] = host_pipe[1 ];return host_pipe[0 ];#elif defined(TARGET_SPARC ) - ((CPUSPARCState *)cpu_env)->regwptr[1 ] = host_pipe[1 ]; + cpu_env->regwptr[1 ] = host_pipe[1 ];return host_pipe[0 ];#endif }
@@ -7584,7 +7584,7 @@ static inline abi_long host_to_target_stat64(CPUArchState *cpu_env, struct stat *host_st) {#if defined(TARGET_ARM ) && defined(TARGET_ABI32 ) -if (((CPUARMState *)cpu_env)->eabi) { +if (cpu_env->eabi) {struct target_eabi_stat64 *target_st;if (!lock_user_struct (VERIFY_WRITE , target_st, target_addr,0 ))
@@ -7983,7 +7983,7 @@ int host_to_target_waitstatus(int status)static int open_self_cmdline (CPUArchState *cpu_env,int fd) { -CPUState *cpu =env_cpu ((CPUArchState *)cpu_env); +CPUState *cpu =env_cpu (cpu_env);struct linux_binprm *bprm = ((TaskState *)cpu->opaque)->bprm;int i;
@@ -8000,7 +8000,7 @@ static int open_self_cmdline(CPUArchState *cpu_env, int fd)static int open_self_maps (CPUArchState *cpu_env,int fd) { -CPUState *cpu =env_cpu ((CPUArchState *)cpu_env); +CPUState *cpu =env_cpu (cpu_env);TaskState *ts = cpu->opaque;GSList *map_info =read_self_maps ();GSList *s;
@@ -8062,7 +8062,7 @@ static int open_self_maps(CPUArchState *cpu_env, int fd)static int open_self_stat (CPUArchState *cpu_env,int fd) { -CPUState *cpu =env_cpu ((CPUArchState *)cpu_env); +CPUState *cpu =env_cpu (cpu_env);TaskState *ts = cpu->opaque;g_autoptr (GString) buf =g_string_new (NULL );int i;
@@ -8100,7 +8100,7 @@ static int open_self_stat(CPUArchState *cpu_env, int fd)static int open_self_auxv (CPUArchState *cpu_env,int fd) { -CPUState *cpu =env_cpu ((CPUArchState *)cpu_env); +CPUState *cpu =env_cpu (cpu_env);TaskState *ts = cpu->opaque;abi_ulong auxv = ts->info->saved_auxv;abi_ulong len = ts->info->auxv_len;
@@ -8910,7 +8910,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,#if defined(TARGET_NR_getxpid) && defined(TARGET_ALPHA )/* Alpha specific */ case TARGET_NR_getxpid: - ((CPUAlphaState *)cpu_env)->ir[IR_A4 ] =getppid (); + cpu_env->ir[IR_A4 ] =getppid ();return get_errno (getpid ());#endif #ifdef TARGET_NR_getpid
@@ -9433,7 +9433,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,if (!is_error (ret)) {host_to_target_old_sigset (&mask, &oldset); ret = mask; - ((CPUAlphaState *)cpu_env)->ir[IR_V0 ] =0 ;/* force no error */ + cpu_env->ir[IR_V0 ] =0 ;/* force no error */ }#else sigset_t set, oldset, *set_ptr;
@@ -10058,7 +10058,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, }#ifdef TARGET_ALPHA /* Return value is the unbiased priority. Signal no error. */ - ((CPUAlphaState *)cpu_env)->ir[IR_V0 ] =0 ; + cpu_env->ir[IR_V0 ] =0 ;#else /* Return value is a biased priority to avoid negative numbers. */ ret =20 - ret;
@@ -11438,7 +11438,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, {uid_t euid; euid=geteuid (); - ((CPUAlphaState *)cpu_env)->ir[IR_A4 ]=euid; + cpu_env->ir[IR_A4 ]=euid; }return get_errno (getuid ());#endif
@@ -11448,7 +11448,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, {uid_t egid; egid=getegid (); - ((CPUAlphaState *)cpu_env)->ir[IR_A4 ]=egid; + cpu_env->ir[IR_A4 ]=egid; }return get_errno (getgid ());#endif
@@ -11460,7 +11460,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,case TARGET_GSI_IEEE_FP_CONTROL : {uint64_t fpcr =cpu_alpha_load_fpcr (cpu_env); -uint64_t swcr = ((CPUAlphaState *)cpu_env)->swcr; +uint64_t swcr = cpu_env->swcr; swcr &= ~SWCR_STATUS_MASK ; swcr |= (fpcr >>35 ) &SWCR_STATUS_MASK ;
@@ -11502,8 +11502,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,* could be queried. Therefore, we store the status * bits only in FPCR. */ - ((CPUAlphaState *)cpu_env)->swcr - = swcr & (SWCR_TRAP_ENABLE_MASK |SWCR_MAP_MASK ); + cpu_env->swcr = swcr & (SWCR_TRAP_ENABLE_MASK |SWCR_MAP_MASK ); fpcr =cpu_alpha_load_fpcr (cpu_env); fpcr &= ((uint64_t )FPCR_DYN_MASK <<32 );
@@ -11527,7 +11526,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, fex =alpha_ieee_fpcr_to_swcr (fpcr); fex = exc & ~fex; fex >>=SWCR_STATUS_TO_EXCSUM_SHIFT ; - fex &= ((CPUArchState *)cpu_env)->swcr; + fex &= (cpu_env)->swcr;/* Update the hardware fpcr. */ fpcr |=alpha_ieee_swcr_to_fpcr (exc);
@@ -11559,9 +11558,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, info.si_signo =SIGFPE ; info.si_errno =0 ; info.si_code = si_code; - info._sifields._sigfault._addr - = ((CPUArchState *)cpu_env)->pc; -queue_signal ((CPUArchState *)cpu_env, info.si_signo, + info._sifields._sigfault._addr = (cpu_env)->pc; +queue_signal (cpu_env, info.si_signo,QEMU_SI_FAULT , &info); } ret =0 ;
@@ -11847,7 +11845,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,to_flock64_fn *copyto = copy_to_user_flock64;#ifdef TARGET_ARM -if (!((CPUARMState *)cpu_env)->eabi) { +if (!cpu_env->eabi) { copyfrom = copy_from_user_oabi_flock64; copyto = copy_to_user_oabi_flock64; }
@@ -12075,13 +12073,13 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,#ifdef TARGET_NR_set_thread_areacase TARGET_NR_set_thread_area:#if defined(TARGET_MIPS ) - ((CPUMIPSState *) cpu_env)->active_tc.CP0_UserLocal = arg1; + cpu_env->active_tc.CP0_UserLocal = arg1;return 0 ;#elif defined(TARGET_CRIS )if (arg1 &0xff ) ret = -TARGET_EINVAL ;else { - ((CPUCRISState *) cpu_env)->pregs[PR_PID ] = arg1; + cpu_env->pregs[PR_PID ] = arg1; ret =0 ; }return ret;
@@ -12816,8 +12814,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, info.si_errno =0 ; info.si_code =TARGET_SEGV_MAPERR ; info._sifields._sigfault._addr = arg6; -queue_signal ((CPUArchState *)cpu_env, info.si_signo, -QEMU_SI_FAULT , &info); +queue_signal (cpu_env, info.si_signo,QEMU_SI_FAULT , &info); ret =0xdeadbeef ; }
linux-user/uname.c +1 -1
@@ -55,7 +55,7 @@ const char *cpu_to_uname_machine(CPUArchState *cpu_env)return "armv5te" utsname_suffix;#elif defined(TARGET_I386 ) && !defined(TARGET_X86_64 )/* see arch/x86/kernel/cpu/bugs.c: check_bugs(), 386, 486, 586, 686 */ -CPUState *cpu =env_cpu ((CPUX86State *)cpu_env); +CPUState *cpu =env_cpu (cpu_env);int family =object_property_get_int (OBJECT (cpu),"family" ,NULL );if (family ==4 ) {return "i486" ;
linux-user/user-internals.h +1 -1
@@ -134,7 +134,7 @@ void print_termios(void *arg);#ifdef TARGET_ARM static inline int regpairs_aligned (CPUArchState *cpu_env,int num) { -return ((((CPUARMState *)cpu_env)->eabi) ==1 ) ; +return cpu_env->eabi ==1 ; }#elif defined(TARGET_MIPS ) && (TARGET_ABI_BITS ==32 )static inline int regpairs_aligned (CPUArchState *cpu_env,int num) {return 1 ; }
Signature · 1 line
2.34.1