struct syscallname {
int nr;
- char *name;
- char *format;
- void (*call)(struct syscallname *,
- target_long, target_long, target_long,
- target_long, target_long, target_long);
- void (*result)(struct syscallname *, target_long);
+ const char *name;
+ const char *format;
+ void (*call)(const struct syscallname *,
+ abi_long, abi_long, abi_long,
+ abi_long, abi_long, abi_long);
+ void (*result)(const struct syscallname *, abi_long);
};
/*
gemu_log("%d",cmd);
}
+#ifdef TARGET_NR__newselect
static void
-print_fdset(int n, target_ulong target_fds_addr)
+print_fdset(int n, abi_ulong target_fds_addr)
{
int i;
gemu_log("[");
if( target_fds_addr ) {
- target_long *target_fds;
+ abi_long *target_fds;
+
+ target_fds = lock_user(VERIFY_READ,
+ target_fds_addr,
+ sizeof(*target_fds)*(n / TARGET_ABI_BITS + 1),
+ 1);
- if (!access_ok(VERIFY_READ, target_fds_addr, sizeof(*target_fds)*(n / TARGET_LONG_BITS + 1)))
+ if (!target_fds)
return;
- target_fds = lock_user(target_fds_addr, sizeof(*target_fds)*(n / TARGET_LONG_BITS + 1), 1);
for (i=n; i>=0; i--) {
- if ((tswapl(target_fds[i / TARGET_LONG_BITS]) >> (i & (TARGET_LONG_BITS - 1))) & 1)
+ if ((tswapl(target_fds[i / TARGET_ABI_BITS]) >> (i & (TARGET_ABI_BITS - 1))) & 1)
gemu_log("%d,", i );
}
unlock_user(target_fds, target_fds_addr, 0);
}
static void
-print_timeval(target_ulong tv_addr)
+print_timeval(abi_ulong tv_addr)
{
if( tv_addr ) {
struct target_timeval *tv;
- if (!access_ok(VERIFY_READ, tv_addr, sizeof(*tv)))
+ tv = lock_user(VERIFY_READ, tv_addr, sizeof(*tv), 1);
+ if (!tv)
return;
-
- tv = lock_user(tv_addr, sizeof(*tv), 1);
gemu_log("{" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "}",
tv->tv_sec, tv->tv_usec);
unlock_user(tv, tv_addr, 0);
} else
gemu_log("NULL");
}
+#endif
/*
* Sysycall specific output functions
*/
/* select */
+#ifdef TARGET_NR__newselect
static long newselect_arg1 = 0;
static long newselect_arg2 = 0;
static long newselect_arg3 = 0;
static long newselect_arg5 = 0;
static void
-print_newselect(struct syscallname *name,
- target_long arg1, target_long arg2, target_long arg3,
- target_long arg4, target_long arg5, target_long arg6)
+print_newselect(const struct syscallname *name,
+ abi_long arg1, abi_long arg2, abi_long arg3,
+ abi_long arg4, abi_long arg5, abi_long arg6)
{
- gemu_log("%s(" TARGET_FMT_ld ",", name->name, arg1);
+ gemu_log("%s(" TARGET_ABI_FMT_ld ",", name->name, arg1);
print_fdset(arg1, arg2);
gemu_log(",");
print_fdset(arg1, arg3);
newselect_arg4=arg4;
newselect_arg5=arg5;
}
+#endif
+#ifdef TARGET_NR_semctl
static void
-print_semctl(struct syscallname *name,
- target_long arg1, target_long arg2, target_long arg3,
- target_long arg4, target_long arg5, target_long arg6)
+print_semctl(const struct syscallname *name,
+ abi_long arg1, abi_long arg2, abi_long arg3,
+ abi_long arg4, abi_long arg5, abi_long arg6)
{
- gemu_log("%s(" TARGET_FMT_ld "," TARGET_FMT_ld ",", name->name, arg1, arg2);
+ gemu_log("%s(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ",", name->name, arg1, arg2);
print_ipc_cmd(arg3);
- gemu_log(",0x" TARGET_FMT_lx ")", arg4);
+ gemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4);
}
+#endif
static void
-print_execve(struct syscallname *name,
- target_long arg1, target_long arg2, target_long arg3,
- target_long arg4, target_long arg5, target_long arg6)
+print_execve(const struct syscallname *name,
+ abi_long arg1, abi_long arg2, abi_long arg3,
+ abi_long arg4, abi_long arg5, abi_long arg6)
{
- target_ulong arg_ptr_addr;
+ abi_ulong arg_ptr_addr;
char *s;
- if (!access_ok(VERIFY_READ, arg1, 1))
+ if (!(s = lock_user_string(arg1)))
return;
-
- s = lock_user_string(arg1);
gemu_log("%s(\"%s\",{", name->name, s);
unlock_user(s, arg1, 0);
- for (arg_ptr_addr = arg2; ; arg_ptr_addr += sizeof(target_ulong)) {
- target_ulong *arg_ptr, arg_addr, s_addr;
+ for (arg_ptr_addr = arg2; ; arg_ptr_addr += sizeof(abi_ulong)) {
+ abi_ulong *arg_ptr, arg_addr;
- if (!access_ok(VERIFY_READ, arg_ptr_addr, sizeof(target_ulong)))
+ arg_ptr = lock_user(VERIFY_READ, arg_ptr_addr, sizeof(abi_ulong), 1);
+ if (!arg_ptr)
return;
-
- arg_ptr = lock_user(arg_ptr_addr, sizeof(target_ulong), 1);
arg_addr = tswapl(*arg_ptr);
unlock_user(arg_ptr, arg_ptr_addr, 0);
if (!arg_addr)
break;
- s = lock_user_string(arg_addr);
- gemu_log("\"%s\",", s);
- unlock_user(s, s_addr, 0);
+ if ((s = lock_user_string(arg_addr))) {
+ gemu_log("\"%s\",", s);
+ unlock_user(s, arg_addr, 0);
+ }
}
gemu_log("NULL})");
}
+#ifdef TARGET_NR_ipc
static void
-print_ipc(struct syscallname *name,
- target_long arg1, target_long arg2, target_long arg3,
- target_long arg4, target_long arg5, target_long arg6)
+print_ipc(const struct syscallname *name,
+ abi_long arg1, abi_long arg2, abi_long arg3,
+ abi_long arg4, abi_long arg5, abi_long arg6)
{
switch(arg1) {
case IPCOP_semctl:
- name->name = "semctl";
- print_semctl(name,arg2,arg3,arg4,arg5,arg6,0);
+ gemu_log("semctl(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ",", arg1, arg2);
+ print_ipc_cmd(arg3);
+ gemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4);
break;
default:
- gemu_log("%s(" TARGET_FMT_ld "," TARGET_FMT_ld "," TARGET_FMT_ld "," TARGET_FMT_ld ")",
+ gemu_log("%s(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ")",
name->name, arg1, arg2, arg3, arg4);
}
}
+#endif
/*
* Variants for the return value output function
*/
static void
-print_syscall_ret_addr(struct syscallname *name, target_long ret)
+print_syscall_ret_addr(const struct syscallname *name, abi_long ret)
{
if( ret == -1 ) {
gemu_log(" = -1 errno=%d (%s)\n", errno, target_strerror(errno));
} else {
- gemu_log(" = " TARGET_FMT_lx "\n", ret);
+ gemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret);
}
}
#if 0 /* currently unused */
static void
-print_syscall_ret_raw(struct syscallname *name, target_long ret)
+print_syscall_ret_raw(struct syscallname *name, abi_long ret)
{
- gemu_log(" = " TARGET_FMT_lx "\n", ret);
+ gemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret);
}
#endif
#ifdef TARGET_NR__newselect
static void
-print_syscall_ret_newselect(struct syscallname *name, target_long ret)
+print_syscall_ret_newselect(const struct syscallname *name, abi_long ret)
{
- gemu_log(" = " TARGET_FMT_lx " (", ret);
+ gemu_log(" = 0x" TARGET_ABI_FMT_lx " (", ret);
print_fdset(newselect_arg1,newselect_arg2);
gemu_log(",");
print_fdset(newselect_arg1,newselect_arg3);
* An array of all of the syscalls we know about
*/
-static struct syscallname scnames[] = {
+static const struct syscallname scnames[] = {
#include "strace.list"
};
-static int nsyscalls = sizeof(scnames)/sizeof(struct syscallname);
+static int nsyscalls = ARRAY_SIZE(scnames);
/*
* The public interface to this module.
*/
void
print_syscall(int num,
- target_long arg1, target_long arg2, target_long arg3,
- target_long arg4, target_long arg5, target_long arg6)
+ abi_long arg1, abi_long arg2, abi_long arg3,
+ abi_long arg4, abi_long arg5, abi_long arg6)
{
int i;
- char *format="%s(%ld,%ld,%ld,%ld,%ld,%ld)";
+ const char *format="%s(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ")";
gemu_log("%d ", getpid() );
if( scnames[i].call != NULL ) {
scnames[i].call(&scnames[i],arg1,arg2,arg3,arg4,arg5,arg6);
} else {
+ /* XXX: this format system is broken because it uses
+ host types and host pointers for strings */
if( scnames[i].format != NULL )
format = scnames[i].format;
gemu_log(format,scnames[i].name, arg1,arg2,arg3,arg4,arg5,arg6);
}
- break;
+ return;
}
+ gemu_log("Unknown syscall %d\n", num);
}
void
-print_syscall_ret(int num, target_long ret)
+print_syscall_ret(int num, abi_long ret)
{
int i;
scnames[i].result(&scnames[i],ret);
} else {
if( ret < 0 ) {
- gemu_log(" = -1 errno=%d (%s)\n", -ret, target_strerror(-ret));
+ gemu_log(" = -1 errno=" TARGET_ABI_FMT_ld " (%s)\n", -ret, target_strerror(-ret));
} else {
- gemu_log(" = %d\n", ret);
+ gemu_log(" = " TARGET_ABI_FMT_ld "\n", ret);
}
}
break;
}
}
-
projects / qemu.git / blobdiff