From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Mon, 15 Nov 2004 15:31:17 +0000 (+0000)
Subject: Fill in missing cases in scalar.
X-Git-Tag: svn/VALGRIND_3_0_0~1306
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a01f2960bea29a6ea4db86a4b6f0dc24bc7087d5;p=thirdparty%2Fvalgrind.git

Fill in missing cases in scalar.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3006
---

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index b040cfaa94..80e96278bd 100644
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -6452,7 +6452,7 @@ static const struct sys_info sys_info[] = {
    SYSX_(__NR_fchown,           sys_fchown16),     // 95 ## (SVr4,BSD4.3)
    SYSX_(__NR_getpriority,      sys_getpriority),  // 96 * (SVr4,4.4BSD)
    SYSX_(__NR_setpriority,      sys_setpriority),  // 97 * (SVr4,4.4BSD)
-   //   (__NR_profil,           sys_ni_syscall),   // 98 * P -- unimplemented
+   SYSX_(__NR_profil,           sys_ni_syscall),   // 98 * P -- unimplemented
    SYSXY(__NR_statfs,           sys_statfs),       // 99 * (P-ish)
 
    SYSXY(__NR_fstatfs,          sys_fstatfs),      // 100 * (P-ish)
diff --git a/memcheck/tests/scalar.c b/memcheck/tests/scalar.c
index 6724d9f89e..dd369c3d7e 100644
--- a/memcheck/tests/scalar.c
+++ b/memcheck/tests/scalar.c
@@ -15,234 +15,241 @@ int main(void)
    // (see below)
 
    // __NR_fork 2
+   // (see scalar_fork.c)
 
-   // __NR_read 3 --> sys_read()
+   // __NR_read 3
    // Nb: here we are also getting an error from the syscall arg itself.
    GO(__NR_read, "1+3s 1m");
    SY(__NR_read+x0, x0, x0, x0+1);
 
-   // __NR_write 4 --> sys_write()
+   // __NR_write 4
    GO(__NR_write, "3s 1m");
    SY(__NR_write, x0, x0, x0+1);
 
-   // __NR_open 5 --> sys_open()
+   // __NR_open 5
    GO(__NR_open, "(2-args) 2s 1m");
    SY(__NR_open, x0, x0, x0+1);
 
    GO(__NR_open, "(3-args) 1s 0m");
    SY(__NR_open, "tmp_write_file_foo", O_CREAT, x0);
 
-   // __NR_close 6 --> sys_close()
+   // __NR_close 6
    GO(__NR_close, "1s 0m");
    SY(__NR_close, x0-1);
 
-   // __NR_waitpid 7 --> sys_waitpid()
+   // __NR_waitpid 7
    GO(__NR_waitpid, "3s 1m");
    SY(__NR_waitpid, x0, x0+1, x0);
 
-   // __NR_creat 8 --> sys_creat()
+   // __NR_creat 8
    GO(__NR_creat, "2s 1m");
    SY(__NR_creat, x0, x0);
 
-   // __NR_link 9 --> sys_link()
+   // __NR_link 9
    GO(__NR_link, "2s 2m");
    SY(__NR_link, x0, x0);
 
-   // __NR_unlink 10 --> sys_unlink()
+   // __NR_unlink 10
    GO(__NR_unlink, "1s 1m");
    SY(__NR_unlink, x0);
 
-   // __NR_execve 11 --> sys_execve()
+   // __NR_execve 11
    // Nb: could have 3 memory errors if we pass x0+1 as the 2nd and 3rd
    // args, except for bug #93174.
    GO(__NR_execve, "3s 1m");
    SY(__NR_execve, x0, x0, x0);
 
-   // __NR_chdir 12 --> sys_chdir()
+   // __NR_chdir 12
    GO(__NR_chdir, "1s 1m");
    SY(__NR_chdir, x0);
 
-   // __NR_time 13 --> sys_time()
+   // __NR_time 13
    GO(__NR_time, "1s 1m");
    SY(__NR_time, x0+1);
 
-   // __NR_mknod 14 --> sys_mknod()
+   // __NR_mknod 14
    GO(__NR_mknod, "3s 1m");
    SY(__NR_mknod, x0, x0, x0);
 
-   // __NR_chmod 15 --> sys_chmod()
+   // __NR_chmod 15
    GO(__NR_chmod, "2s 1m");
    SY(__NR_chmod, x0, x0);
 
    // __NR_lchown 16
-   // (Not yet handled by Valgrind)
+   GO(__NR_lchown, "n/a");
+ //SY(__NR_lchown); // (Not yet handled by Valgrind)
 
-   // __NR_break 17 --> sys_ni_syscall()
-   GO(__NR_break, "0e");
+   // __NR_break 17
+   GO(__NR_break, "ni");
    SY(__NR_break);
 
    // __NR_oldstat 18
+   GO(__NR_oldstat, "n/a");
    // (obsolete, not handled by Valgrind)
 
-   // __NR_lseek 19 --> sys_lseek()
+   // __NR_lseek 19
    GO(__NR_lseek, "3s 0m");
    SY(__NR_lseek, x0, x0, x0);
 
-   // __NR_getpid 20 --> sys_getpid()
+   // __NR_getpid 20
    GO(__NR_getpid, "0s 0m");
    SY(__NR_getpid);
 
-   // __NR_mount 21 --> sys_mount()
+   // __NR_mount 21
    GO(__NR_mount, "5s 3m");
    SY(__NR_mount, x0, x0, x0, x0, x0);
    
-   // __NR_umount 22 --> sys_oldumount()
+   // __NR_umount 22
    GO(__NR_umount, "1s 1m");
    SY(__NR_umount, x0);
 
-   // __NR_setuid 23 --> sys_setuid16()
+   // __NR_setuid 23
    GO(__NR_setuid, "1s 0m");
    SY(__NR_setuid, x0);
 
-   // __NR_getuid 24 --> sys_getuid16()
-   GO(__NR_getuid, "0e");
+   // __NR_getuid 24
+   GO(__NR_getuid, "0s 0m");
    SY(__NR_getuid);
 
    // __NR_stime 25
-   // (Not yet handled by Valgrind)
+   GO(__NR_stime, "n/a");
+ //SY(__NR_stime); // (Not yet handled by Valgrind)
 
-   // __NR_ptrace 26 --> arch/sys_ptrace()
+   // __NR_ptrace 26
    // XXX: memory pointed to be arg3 is never checked...
    GO(__NR_ptrace, "4s 2m");
    SY(__NR_ptrace, x0+PTRACE_GETREGS, x0, x0, x0);
 
-   // __NR_alarm 27 --> sys_alarm()
+   // __NR_alarm 27
    GO(__NR_alarm, "1s 0m");
    SY(__NR_alarm, x0);
 
    // __NR_oldfstat 28
+   GO(__NR_oldfstat, "n/a");
    // (obsolete, not handled by Valgrind)
 
-   // __NR_pause 29 --> sys_pause()
+   // __NR_pause 29
    // XXX: will have to be tested separately
 
-   // __NR_utime 30 --> sys_utime()
+   // __NR_utime 30
    GO(__NR_utime, "2s 2m");
    SY(__NR_utime, x0, x0+1);
 
-   // __NR_stty 31 --> sys_ni_syscall()
-   GO(__NR_stty, "0e");
+   // __NR_stty 31
+   GO(__NR_stty, "ni");
    SY(__NR_stty);
 
-   // __NR_gtty 32 --> sys_ni_syscall()
-   GO(__NR_gtty, "0e");
+   // __NR_gtty 32
+   GO(__NR_gtty, "ni");
    SY(__NR_gtty);
 
-   // __NR_access 33 --> sys_access()
+   // __NR_access 33
    GO(__NR_access, "2s 1m");
    SY(__NR_access, x0, x0);
 
-   // __NR_nice 34 --> sys_nice()
+   // __NR_nice 34
    GO(__NR_nice, "1s 0m");
    SY(__NR_nice, x0);
 
-   // __NR_ftime 35 --> sys_ni_syscall()
-   GO(__NR_ftime, "0e");
+   // __NR_ftime 35
+   GO(__NR_ftime, "ni");
    SY(__NR_ftime);
 
-   // __NR_sync 36 --> sys_sync()
-   GO(__NR_sync, "0e");
+   // __NR_sync 36
+   GO(__NR_sync, "0s 0m");
    SY(__NR_sync);
 
-   // __NR_kill 37 --> sys_kill()
+   // __NR_kill 37
    GO(__NR_kill, "2s 0m");
    SY(__NR_kill, x0, x0);
 
-   // __NR_rename 38 --> sys_rename()
+   // __NR_rename 38
    GO(__NR_rename, "2s 2m");
    SY(__NR_rename, x0, x0);
 
-   // __NR_mkdir 39 --> sys_mkdir()
+   // __NR_mkdir 39
    GO(__NR_mkdir, "2s 1m");
    SY(__NR_mkdir, x0, x0);
 
-   // __NR_rmdir 40 --> sys_rmdir()
+   // __NR_rmdir 40
    GO(__NR_rmdir, "1s 1m");
    SY(__NR_rmdir, x0);
 
-   // __NR_dup 41 --> sys_dup()
+   // __NR_dup 41
    GO(__NR_dup, "1s 0m");
    SY(__NR_dup, x0);
 
-   // __NR_pipe 42 --> arch/sys_pipe()
+   // __NR_pipe 42
    GO(__NR_pipe, "1s 1m");
    SY(__NR_pipe, x0);
 
-   // __NR_times 43 --> sys_times()
+   // __NR_times 43
    GO(__NR_times, "1s 1m");
    SY(__NR_times, x0);
 
-   // __NR_prof 44 --> sys_ni_syscall()
-   GO(__NR_prof, "0e");
+   // __NR_prof 44
+   GO(__NR_prof, "ni");
    SY(__NR_prof);
 
-   // __NR_brk 45 --> sys_brk()
+   // __NR_brk 45
    GO(__NR_brk, "1s 0m");
    SY(__NR_brk, x0);
 
-   // __NR_setgid 46 --> sys_setgid16()
+   // __NR_setgid 46
    GO(__NR_setgid, "1s 0m");
    SY(__NR_setgid, x0);
 
-   // __NR_getgid 47 --> sys_getgid16()
-   GO(__NR_getgid, "0e");
+   // __NR_getgid 47
+   GO(__NR_getgid, "0s 0m");
    SY(__NR_getgid);
 
    // __NR_signal 48
-   // (Not yet handled by Valgrind)
+   GO(__NR_signal, "n/a");
+ //SY(__NR_signal); // (Not yet handled by Valgrind)
 
-   // __NR_geteuid 49 --> sys_geteuid16()
-   GO(__NR_geteuid, "0e");
+   // __NR_geteuid 49
+   GO(__NR_geteuid, "0s 0m");
    SY(__NR_geteuid);
 
-   // __NR_getegid 50 --> sys_getegid16()
-   GO(__NR_getegid, "0e");
+   // __NR_getegid 50
+   GO(__NR_getegid, "0s 0m");
    SY(__NR_getegid);
 
-   // __NR_acct 51 --> sys_acct()
+   // __NR_acct 51
    GO(__NR_acct, "1s 1m");
    SY(__NR_acct, x0);
 
-   // __NR_umount2 52 --> sys_umount()
+   // __NR_umount2 52
    GO(__NR_umount2, "2s 1m");
    SY(__NR_umount2, x0, x0);
 
-   // __NR_lock 53 --> sys_ni_syscall()
-   GO(__NR_lock, "0e");
+   // __NR_lock 53
+   GO(__NR_lock, "ni");
    SY(__NR_lock);
 
-   // __NR_ioctl 54 --> sys_ioctl()
+   // __NR_ioctl 54
    #include <asm/ioctls.h>
    GO(__NR_ioctl, "3s 1m");
    SY(__NR_ioctl, x0, x0+TCSETS, x0);
 
-   // __NR_fcntl 55 --> sys_fcntl()
+   // __NR_fcntl 55
    GO(__NR_fcntl, "3s 0m");
    SY(__NR_fcntl, x0, x0, x0);
 
-   // __NR_mpx 56 --> sys_ni_syscall()
-   GO(__NR_mpx, "0e");
+   // __NR_mpx 56
+   GO(__NR_mpx, "ni");
    SY(__NR_mpx);
 
    // __NR_setpgid 57
    GO(__NR_setpgid, "2s 0m");
    SY(__NR_setpgid, x0, x0);
 
-   // __NR_ulimit 58 --> sys_ni_syscall()
-   GO(__NR_ulimit, "0e");
+   // __NR_ulimit 58
+   GO(__NR_ulimit, "ni");
    SY(__NR_ulimit);
 
    // __NR_oldolduname 59
+   GO(__NR_oldolduname, "n/a");
    // (obsolete, not handled by Valgrind)
 
    // __NR_umask 60
@@ -254,55 +261,59 @@ int main(void)
    SY(__NR_chroot, x0);
 
    // __NR_ustat 62
+   GO(__NR_ustat, "n/a");
    // (deprecated, not handled by Valgrind)
 
    // __NR_dup2 63
    GO(__NR_dup2, "2s 0m");
    SY(__NR_dup2, x0, x0);
 
-   // __NR_getppid 64 --> sys_getppid()
-   GO(__NR_getppid, "0e");
+   // __NR_getppid 64
+   GO(__NR_getppid, "0s 0m");
    SY(__NR_getppid);
 
-   // __NR_getpgrp 65 --> sys_getpgrp()
-   GO(__NR_getpgrp, "0e");
+   // __NR_getpgrp 65
+   GO(__NR_getpgrp, "0s 0m");
    SY(__NR_getpgrp);
 
-   // __NR_setsid 66 --> sys_setsid()
-   GO(__NR_setsid, "0e");
+   // __NR_setsid 66
+   GO(__NR_setsid, "0s 0m");
    SY(__NR_setsid);
 
-   // __NR_sigaction 67 --> sys_sigaction()
+   // __NR_sigaction 67
    GO(__NR_sigaction, "3s 2m");
    SY(__NR_sigaction, x0, x0+1, x0+1);
 
-   // __NR_sgetmask 68
-   // (Not yet handled by Valgrind)
+   // __NR_sgetmask 68 sys_sgetmask()
+   GO(__NR_sgetmask, "n/a");
+ //SY(__NR_sgetmask); // (Not yet handled by Valgrind)
 
    // __NR_ssetmask 69
-   // (Not yet handled by Valgrind)
+   GO(__NR_ssetmask, "n/a");
+ //SY(__NR_ssetmask); // (Not yet handled by Valgrind)
 
-   // __NR_setreuid 70 --> sys_setreuid16()
+   // __NR_setreuid 70
    GO(__NR_setreuid, "2s 0m");
    SY(__NR_setreuid, x0, x0);
 
-   // __NR_setregid 71 --> sys_setregid16()
+   // __NR_setregid 71
    GO(__NR_setregid, "2s 0m");
    SY(__NR_setregid, x0, x0);
 
-   // __NR_sigsuspend 72 --> sys_sigsuspend()
+   // __NR_sigsuspend 72
    // XXX: how do you use this function?
 // GO(__NR_sigsuspend, ".s .m");
 // SY(__NR_sigsuspend);
 
-   // __NR_sigpending 73 --> sys_sigpending()
+   // __NR_sigpending 73
    GO(__NR_sigpending, "1s 1m");
    SY(__NR_sigpending, x0);
 
    // __NR_sethostname 74
-   // (Not yet handled by Valgrind)
+   GO(__NR_sethostname, "n/a");
+ //SY(__NR_sethostname); // (Not yet handled by Valgrind)
 
-   // __NR_setrlimit 75 --> sys_setrlimit()
+   // __NR_setrlimit 75
    GO(__NR_setrlimit, "2s 1m");
    SY(__NR_setrlimit, x0, x0);
 
@@ -314,34 +325,35 @@ int main(void)
    GO(__NR_getrusage, "2s 1m");
    SY(__NR_getrusage, x0, x0);
 
-   // __NR_gettimeofday 78 --> sys_gettimeofday()
+   // __NR_gettimeofday 78
    GO(__NR_gettimeofday, "2s 2m");
    SY(__NR_gettimeofday, x0, x0+1);
 
-   // __NR_settimeofday 79 --> sys_settimeofday()
+   // __NR_settimeofday 79
    GO(__NR_settimeofday, "2s 2m");
    SY(__NR_settimeofday, x0, x0+1);
 
-   // __NR_getgroups 80 --> sys_getgroups16()
+   // __NR_getgroups 80
    GO(__NR_getgroups, "2s 1m");
    SY(__NR_getgroups, x0+1, x0+1);
 
-   // __NR_setgroups 81 --> sys_setgroups16()
+   // __NR_setgroups 81
    GO(__NR_setgroups, "2s 1m");
    SY(__NR_setgroups, x0+1, x0+1);
 
-   // __NR_select 82 --> old_select()
+   // __NR_select 82
    {
       long args[5] = { x0+8, x0+0xffffffee, x0+1, x0+1, x0+1 };
       GO(__NR_select, "1s 4m");
       SY(__NR_select, args+x0);
    }
 
-   // __NR_symlink 83 --> sys_symlink()
+   // __NR_symlink 83
    GO(__NR_symlink, "2s 2m");
    SY(__NR_symlink, x0, x0);
 
    // __NR_oldlstat 84
+   GO(__NR_oldlstat, "n/a");
    // (obsolete, not handled by Valgrind)
 
    // __NR_readlink 85
@@ -349,117 +361,122 @@ int main(void)
    SY(__NR_readlink, x0+1, x0+1, x0+1);
 
    // __NR_uselib 86
-   // (Not yet handled by Valgrind)
+   GO(__NR_uselib, "n/a");
+ //SY(__NR_uselib); // (Not yet handled by Valgrind)
 
    // __NR_swapon 87
-   // (Not yet handled by Valgrind)
+   GO(__NR_swapon, "n/a");
+ //SY(__NR_swapon); // (Not yet handled by Valgrind)
 
    // __NR_reboot 88
-   // (Not yet handled by Valgrind)
+   GO(__NR_reboot, "n/a");
+ //SY(__NR_reboot); // (Not yet handled by Valgrind)
 
    // __NR_readdir 89
+   GO(__NR_readdir, "n/a");
    // (superseded, not handled by Valgrind)
 
-   // __NR_mmap 90 --> old_mmap()
+   // __NR_mmap 90
    {
       long args[6] = { x0, x0, x0, x0, x0-1, x0 };
       GO(__NR_mmap, "1s 0m");
       SY(__NR_mmap, args+x0);
    }
 
-   // __NR_munmap 91 --> sys_munmap()
+   // __NR_munmap 91
    GO(__NR_munmap, "2s 0m");
    SY(__NR_munmap, x0, x0);
 
-   // __NR_truncate 92 --> sys_truncate()
+   // __NR_truncate 92
    GO(__NR_truncate, "2s 1m");
    SY(__NR_truncate, x0, x0);
 
-   // __NR_ftruncate 93 --> sys_ftruncate()
+   // __NR_ftruncate 93
    GO(__NR_ftruncate, "2s 0m");
    SY(__NR_ftruncate, x0, x0);
 
-   // __NR_fchmod 94 --> sys_fchmod()
+   // __NR_fchmod 94
    GO(__NR_fchmod, "2s 0m");
    SY(__NR_fchmod, x0-1, x0);
 
-   // __NR_fchown 95 --> sys_fchown16
+   // __NR_fchown 95
    GO(__NR_fchown, "3s 0m");
    SY(__NR_fchown, x0, x0, x0);
 
-   // __NR_getpriority 96 --> sys_getpriority()
+   // __NR_getpriority 96
    GO(__NR_getpriority, "2s 0m");
    SY(__NR_getpriority, x0, x0);
 
-   // __NR_setpriority 97 --> sys_setpriority()
+   // __NR_setpriority 97
    GO(__NR_setpriority, "3s 0m");
    SY(__NR_setpriority, x0, x0, x0);
 
    // __NR_profil 98
- //GO(__NR_profil, ".s .m");
- //SY(__NR_profil);
+   GO(__NR_profil, "ni");
+   SY(__NR_profil);
 
-   // __NR_statfs 99 --> sys_statfs()
+   // __NR_statfs 99
    GO(__NR_statfs, "2s 2m");
    SY(__NR_statfs, x0, x0);
 
-   // __NR_fstatfs 100 --> sys_fstatfs()
+   // __NR_fstatfs 100
    GO(__NR_fstatfs, "2s 1m");
    SY(__NR_fstatfs, x0, x0);
 
-   // __NR_ioperm 101 --> sys_ioperm()
+   // __NR_ioperm 101
    GO(__NR_ioperm, "3s 0m");
    SY(__NR_ioperm, x0, x0, x0);
 
-   // __NR_socketcall 102 --> sys_socketcall()
+   // __NR_socketcall 102
    // XXX: need to do properly
 // GO(__NR_socketcall, "2s 1m");
 // SY(__NR_socketcall, x0+SYS_SOCKETPAIR, x0);
 
-   // __NR_syslog 103 --> sys_syslog()
+   // __NR_syslog 103
    GO(__NR_syslog, "3s 1m");
    SY(__NR_syslog, x0+2, x0, x0+1);
 
-   // __NR_setitimer 104 --> sys_setitimer()
+   // __NR_setitimer 104
    GO(__NR_setitimer, "3s 2m");
    SY(__NR_setitimer, x0, x0+1, x0+1);
 
-   // __NR_getitimer 105 --> sys_getitimer()
+   // __NR_getitimer 105
    GO(__NR_getitimer, "2s 1m");
    SY(__NR_getitimer, x0, x0, x0);
 
-   // __NR_stat 106 --> sys_newstat()
+   // __NR_stat 106
    GO(__NR_stat, "2s 2m");
    SY(__NR_stat, x0, x0);
 
-   // __NR_lstat 107 --> sys_newlstat()
+   // __NR_lstat 107
    GO(__NR_lstat, "2s 2m");
    SY(__NR_lstat, x0, x0);
 
-   // __NR_fstat 108 --> sys_newfstat()
+   // __NR_fstat 108
    GO(__NR_fstat, "2s 1m");
    SY(__NR_fstat, x0, x0);
 
    // __NR_olduname 109
+   GO(__NR_olduname, "n/a");
    // (obsolete, not handled by Valgrind)
 
-   // __NR_iopl 110 --> sys_iopl()
+   // __NR_iopl 110
    GO(__NR_iopl, "1s 0m");
    SY(__NR_iopl, x0);
 
-   // __NR_vhangup 111 --> sys_vhangup()
-   GO(__NR_vhangup, "0e");
+   // __NR_vhangup 111
+   GO(__NR_vhangup, "0s 0m");
    SY(__NR_vhangup);
    
-   // __NR_idle 112 --> sys_ni_syscall()
-   GO(__NR_idle, "0e");
+   // __NR_idle 112
+   GO(__NR_idle, "ni");
    SY(__NR_idle);
 
    // __NR_vm86old 113
- //GO(__NR_vm86old, ".s .m");
- //SY(__NR_vm86old);
+   GO(__NR_vm86old, "n/a");
+   // (will probably never be handled by Valgrind)
 
-   // __NR_wait4 114 --> sys_wait4()
+   // __NR_wait4 114
    GO(__NR_wait4, "4s 2m");
    SY(__NR_wait4, x0, x0+1, x0, x0+1);
 
@@ -467,7 +484,7 @@ int main(void)
  //GO(__NR_swapoff, ".s .m");
  //SY(__NR_swapoff);
 
-   // __NR_sysinfo 116 --> sys_sysinfo()
+   // __NR_sysinfo 116
    GO(__NR_sysinfo, "1s 1m");
    SY(__NR_sysinfo, x0);
 
@@ -479,7 +496,7 @@ int main(void)
    GO(__NR_ipc, "5s 0m");
    SY(__NR_ipc, x0+4, x0, x0, x0, x0, x0);
 
-   // __NR_fsync 118 --> sys_fsync()
+   // __NR_fsync 118
    GO(__NR_fsync, "1s 0m");
    SY(__NR_fsync, x0-1);
 
@@ -495,7 +512,8 @@ int main(void)
    SY(__NR_clone, x0|CLONE_PARENT_SETTID|SIGCHLD, x0, x0, x0);
 
    // __NR_setdomainname 121
-   // (Not yet handled by Valgrind)
+   GO(__NR_setdomainname, "n/a");
+ //SY(__NR_setdomainname); // (Not yet handled by Valgrind)
 
    // __NR_uname 122
    GO(__NR_uname, "1s 1m");
@@ -505,12 +523,12 @@ int main(void)
  //GO(__NR_modify_ldt, ".s .m");
  //SY(__NR_modify_ldt);
 
-   // __NR_adjtimex 124 --> sys_adjtimex()
+   // __NR_adjtimex 124
    // XXX: need to do properly, but deref'ing NULL...
 //   GO(__NR_adjtimex, "1s 1m");
 //   SY(__NR_adjtimex, x0);
 
-   // __NR_mprotect 125 --> sys_mprotect()
+   // __NR_mprotect 125
    GO(__NR_mprotect, "3s 0m");
    SY(__NR_mprotect, x0, x0, x0);
 
@@ -518,8 +536,8 @@ int main(void)
  //GO(__NR_sigprocmask, ".s .m");
  //SY(__NR_sigprocmask);
 
-   // __NR_create_module 127 --> sys_ni_syscall()
-   GO(__NR_create_module, "0e");
+   // __NR_create_module 127
+   GO(__NR_create_module, "ni");
    SY(__NR_create_module);
 
    // __NR_init_module 128
@@ -527,21 +545,22 @@ int main(void)
  //SY(__NR_init_module);
 
    // __NR_delete_module 129
-   // (Not yet handled by Valgrind)
+   GO(__NR_delete_module, "n/a");
+ //SY(__NR_delete_module); // (Not yet handled by Valgrind)
 
-   // __NR_get_kernel_syms 130 --> sys_ni_syscall()
-   GO(__NR_get_kernel_syms, "0e");
+   // __NR_get_kernel_syms 130
+   GO(__NR_get_kernel_syms, "ni");
    SY(__NR_get_kernel_syms);
 
-   // __NR_quotactl 131 --> sys_quotactl()
+   // __NR_quotactl 131
    GO(__NR_quotactl, "4s 1m");
    SY(__NR_quotactl, x0, x0, x0, x0);
 
-   // __NR_getpgid 132 --> sys_getpgid()
+   // __NR_getpgid 132
    GO(__NR_getpgid, "1s 0m");
    SY(__NR_getpgid, x0);
 
-   // __NR_fchdir 133 --> sys_fchdir()
+   // __NR_fchdir 133
    GO(__NR_fchdir, "1s 0m");
    SY(__NR_fchdir, x0-1);
 
@@ -553,12 +572,12 @@ int main(void)
  //GO(__NR_sysfs, ".s .m");
  //SY(__NR_sysfs);
 
-   // __NR_personality 136 --> sys_personality()
+   // __NR_personality 136
    GO(__NR_personality, "1s 0m");
    SY(__NR_personality, x0);
 
-   // __NR_afs_syscall 137 --> sys_ni_syscall()
-   GO(__NR_afs_syscall, "0e");
+   // __NR_afs_syscall 137
+   GO(__NR_afs_syscall, "ni");
    SY(__NR_afs_syscall);
 
    // __NR_setfsuid 138
@@ -573,11 +592,11 @@ int main(void)
  //GO(__NR__llseek, ".s .m");
  //SY(__NR__llseek);
 
-   // __NR_getdents 141 --> sys_getdents()
+   // __NR_getdents 141
    GO(__NR_getdents, "3s 1m");
    SY(__NR_getdents, x0, x0, x0+1);
 
-   // __NR__newselect 142 --> sys_select()
+   // __NR__newselect 142
    GO(__NR__newselect, "5s 4m");
    SY(__NR__newselect, x0+8, x0+0xffffffff, x0+1, x0+1, x0+1);
 
@@ -585,7 +604,7 @@ int main(void)
    GO(__NR_flock, "2s 0m");
    SY(__NR_flock, x0, x0);
 
-   // __NR_msync 144 --> sys_msync()
+   // __NR_msync 144
    GO(__NR_msync, "3s 0m");
    SY(__NR_msync, x0, x0, x0);
 
@@ -597,11 +616,11 @@ int main(void)
  //GO(__NR_writev, ".s .m");
  //SY(__NR_writev);
 
-   // __NR_getsid 147 --> sys_getsid()
+   // __NR_getsid 147
    GO(__NR_getsid, "1s 0m");
    SY(__NR_getsid, x0);
 
-   // __NR_fdatasync 148 --> sys_fdatasync()
+   // __NR_fdatasync 148
    GO(__NR_fdatasync, "1s 0m");
    SY(__NR_fdatasync, x0-1);
 
@@ -609,35 +628,35 @@ int main(void)
  //GO(__NR__sysctl, ".s .m");
  //SY(__NR__sysctl);
 
-   // __NR_mlock 150 --> sys_mlock()
+   // __NR_mlock 150
    GO(__NR_mlock, "2s 0m");
    SY(__NR_mlock, x0, x0);
 
-   // __NR_munlock 151 --> sys_munlock()
+   // __NR_munlock 151
    GO(__NR_munlock, "2s 0m");
    SY(__NR_munlock, x0, x0);
 
-   // __NR_mlockall 152 --> sys_mlockall()
+   // __NR_mlockall 152
    GO(__NR_mlockall, "2s 0m");
    SY(__NR_mlockall, x0, x0);
 
-   // __NR_munlockall 153 --> sys_munlockall()
-   GO(__NR_munlockall, "0e");
+   // __NR_munlockall 153
+   GO(__NR_munlockall, "0s 0m");
    SY(__NR_munlockall);
 
-   // __NR_sched_setparam 154 --> sys_sched_setparam()
+   // __NR_sched_setparam 154
    GO(__NR_sched_setparam, "2s 1m");
    SY(__NR_sched_setparam, x0, x0);
 
-   // __NR_sched_getparam 155 --> sys_sched_getparam()
+   // __NR_sched_getparam 155
    GO(__NR_sched_getparam, "2s 1m");
    SY(__NR_sched_getparam, x0, x0);
 
-   // __NR_sched_setscheduler 156 --> sys_sched_setscheduler()
+   // __NR_sched_setscheduler 156
    GO(__NR_sched_setscheduler, "3s 1m");
    SY(__NR_sched_setscheduler, x0, x0, x0+1);
 
-   // __NR_sched_getscheduler 157 --> sys_sched_getscheduler()
+   // __NR_sched_getscheduler 157
    GO(__NR_sched_getscheduler, "1s 0m");
    SY(__NR_sched_getscheduler, x0);
 
@@ -645,18 +664,19 @@ int main(void)
  //GO(__NR_sched_yield, ".s .m");
  //SY(__NR_sched_yield);
 
-   // __NR_sched_get_priority_max 159 --> sys_sched_get_priority_min()
+   // __NR_sched_get_priority_max 159
    GO(__NR_sched_get_priority_max, "1s 0m");
    SY(__NR_sched_get_priority_max, x0);
 
-   // __NR_sched_get_priority_min 160 --> sys_sched_get_priority_min()
+   // __NR_sched_get_priority_min 160
    GO(__NR_sched_get_priority_min, "1s 0m");
    SY(__NR_sched_get_priority_min, x0);
 
    // __NR_sched_rr_get_interval 161
-   // (Not yet handled by Valgrind)
+   GO(__NR_sched_rr_get_interval, "n/a");
+ //SY(__NR_sched_rr_get_interval); // (Not yet handled by Valgrind)
 
-   // __NR_nanosleep 162 --> sys_nanosleep()
+   // __NR_nanosleep 162
    GO(__NR_nanosleep, "2s 2m");
    SY(__NR_nanosleep, x0, x0+1);
 
@@ -664,35 +684,35 @@ int main(void)
  //GO(__NR_mremap, ".s .m");
  //SY(__NR_mremap);
 
-   // __NR_setresuid 164 --> sys_setresuid16()
+   // __NR_setresuid 164
    GO(__NR_setresuid, "3s 0m");
    SY(__NR_setresuid, x0, x0, x0);
 
-   // __NR_getresuid 165 --> sys_getresuid16()
+   // __NR_getresuid 165
    GO(__NR_getresuid, "3s 3m");
    SY(__NR_getresuid, x0, x0, x0);
 
    // __NR_vm86 166
- //GO(__NR_vm86, ".s .m");
- //SY(__NR_vm86);
+   GO(__NR_vm86, "n/a");
+   // (will probably never be handled by Valgrind)
 
-   // __NR_query_module 167 --> sys_ni_syscall()
-   GO(__NR_query_module, "0e");
+   // __NR_query_module 167
+   GO(__NR_query_module, "ni");
    SY(__NR_query_module);
 
-   // __NR_poll 168 --> sys_poll()
+   // __NR_poll 168
    GO(__NR_poll, "3s 1m");
    SY(__NR_poll, x0, x0+1, x0);
 
    // __NR_nfsservctl 169
- //GO(__NR_nfsservctl, ".s .m");
- //SY(__NR_nfsservctl);
+   GO(__NR_nfsservctl, "n/a");
+ //SY(__NR_nfsservctl); // (Not yet handled by Valgrind)
 
-   // __NR_setresgid 170 --> sys_setresgid16()
+   // __NR_setresgid 170
    GO(__NR_setresgid, "3s 0m");
    SY(__NR_setresgid, x0, x0, x0);
 
-   // __NR_getresgid 171 --> sys_getresgid16()
+   // __NR_getresgid 171
    GO(__NR_getresgid, "3s 3m");
    SY(__NR_getresgid, x0, x0, x0);
 
@@ -701,10 +721,10 @@ int main(void)
  //SY(__NR_prctl);
 
    // __NR_rt_sigreturn 173
- //GO(__NR_rt_sigreturn, ".s .m");
- //SY(__NR_rt_sigreturn);
+   GO(__NR_rt_sigreturn, "n/a");
+ //SY(__NR_rt_sigreturn); // (Not yet handled by Valgrind)
 
-   // __NR_rt_sigaction 174 --> sys_rt_sigaction()
+   // __NR_rt_sigaction 174
    GO(__NR_rt_sigaction, "4s 2m");
    SY(__NR_rt_sigaction, x0, x0+1, x0+1, x0);
 
@@ -736,7 +756,7 @@ int main(void)
  //GO(__NR_pwrite64, ".s .m");
  //SY(__NR_pwrite64);
 
-   // __NR_chown 182 --> sys_chown16()
+   // __NR_chown 182
    GO(__NR_chown, "3s 1m");
    SY(__NR_chown, x0, x0, x0);
 
@@ -744,11 +764,11 @@ int main(void)
  //GO(__NR_getcwd, ".s .m");
  //SY(__NR_getcwd);
 
-   // __NR_capget 184 --> sys_capget()
+   // __NR_capget 184
    GO(__NR_capget, "2s 2m");
    SY(__NR_capget, x0, x0);
 
-   // __NR_capset 185 --> sys_capset()
+   // __NR_capset 185
    GO(__NR_capset, "2s 2m");
    SY(__NR_capset, x0, x0);
 
@@ -769,22 +789,22 @@ int main(void)
  //SY(__NR_putpmsg);
 
    // __NR_vfork 190
- //GO(__NR_vfork, ".s .m");
- //SY(__NR_vfork);
+   GO(__NR_vfork, "n/a");
+   // (Valgrind converts this to __NR_fork)
 
    // __NR_ugetrlimit 191
    GO(__NR_ugetrlimit, "2s 1m");
    SY(__NR_ugetrlimit, x0, x0);
 
-   // __NR_mmap2 192 --> sys_mmap()
+   // __NR_mmap2 192
    GO(__NR_mmap2, "5s 0m");
    SY(__NR_mmap2, x0, x0, x0, x0, x0-1, x0);
 
-   // __NR_truncate64 193 --> sys_truncate64()
+   // __NR_truncate64 193
    GO(__NR_truncate64, "3s 1m");
    SY(__NR_truncate64, x0, x0, x0);
 
-   // __NR_ftruncate64 194 --> sys_ftruncate64()
+   // __NR_ftruncate64 194
    GO(__NR_ftruncate64, "3s 0m");
    SY(__NR_ftruncate64, x0, x0, x0);
 
@@ -800,24 +820,24 @@ int main(void)
    GO(__NR_fstat64, "2s 1m");
    SY(__NR_fstat64, x0, x0);
 
-   // __NR_lchown32 198 --> sys_chown()
+   // __NR_lchown32 198
    GO(__NR_lchown32, "3s 1m");
    SY(__NR_lchown32, x0, x0, x0);
 
-   // __NR_getuid32 199 --> sys_getuid()
-   GO(__NR_getuid32, "0e");
+   // __NR_getuid32 199
+   GO(__NR_getuid32, "0s 0m");
    SY(__NR_getuid32);
 
-   // __NR_getgid32 200 --> sys_getgid()
-   GO(__NR_getgid32, "0e");
+   // __NR_getgid32 200
+   GO(__NR_getgid32, "0s 0m");
    SY(__NR_getgid32);
 
-   // __NR_geteuid32 201 --> sys_geteuid()
-   GO(__NR_geteuid32, "0e");
+   // __NR_geteuid32 201
+   GO(__NR_geteuid32, "0s 0m");
    SY(__NR_geteuid32);
 
-   // __NR_getegid32 202 --> sys_getegid()
-   GO(__NR_getegid32, "0e");
+   // __NR_getegid32 202
+   GO(__NR_getegid32, "0s 0m");
    SY(__NR_getegid32);
 
    // __NR_setreuid32 203
@@ -828,39 +848,39 @@ int main(void)
    GO(__NR_setregid32, "2s 0m");
    SY(__NR_setregid32, x0, x0);
 
-   // __NR_getgroups32 205 --> sys_getgroups()
+   // __NR_getgroups32 205
    GO(__NR_getgroups32, "2s 1m");
    SY(__NR_getgroups32, x0+1, x0+1);
 
-   // __NR_setgroups32 206 --> sys_setgroups()
+   // __NR_setgroups32 206
    GO(__NR_setgroups32, "2s 1m");
    SY(__NR_setgroups32, x0+1, x0+1);
 
-   // __NR_fchown32 207 --> sys_fchown()
+   // __NR_fchown32 207
    GO(__NR_fchown32, "3s 0m");
    SY(__NR_fchown32, x0, x0, x0);
 
-   // __NR_setresuid32 208 --> sys_setresuid()
+   // __NR_setresuid32 208
    GO(__NR_setresuid32, "3s 0m");
    SY(__NR_setresuid32, x0, x0, x0);
 
-   // __NR_getresuid32 209 --> sys_getresuid()
+   // __NR_getresuid32 209
    GO(__NR_getresuid32, "3s 3m");
    SY(__NR_getresuid32, x0, x0, x0);
 
-   // __NR_setresgid32 210 --> sys_setresgid()
+   // __NR_setresgid32 210
    GO(__NR_setresgid32, "3s 0m");
    SY(__NR_setresgid32, x0, x0, x0);
 
-   // __NR_getresgid32 211 --> sys_getresgid()
+   // __NR_getresgid32 211
    GO(__NR_getresgid32, "3s 3m");
    SY(__NR_getresgid32, x0, x0, x0);
 
-   // __NR_chown32 212 --> sys_chown()
+   // __NR_chown32 212
    GO(__NR_chown32, "3s 1m");
    SY(__NR_chown32, x0, x0, x0);
 
-   // __NR_setuid32 213 --> sys_setuid()
+   // __NR_setuid32 213
    GO(__NR_setuid32, "1s 0m");
    SY(__NR_setuid32, x0);
 
@@ -868,17 +888,17 @@ int main(void)
    GO(__NR_setgid32, "1s 0m");
    SY(__NR_setgid32, x0);
 
-   // __NR_setfsuid32 215 --> sys_setfsuid()
+   // __NR_setfsuid32 215
    GO(__NR_setfsuid32, "1s 0m");
    SY(__NR_setfsuid32, x0);
 
-   // __NR_setfsgid32 216 --> sys_setfsgid()
+   // __NR_setfsgid32 216
    GO(__NR_setfsgid32, "1s 0m");
    SY(__NR_setfsgid32, x0);
 
    // __NR_pivot_root 217
- //GO(__NR_pivot_root, ".s .m");
- //SY(__NR_pivot_root);
+   GO(__NR_pivot_root, "n/a");
+ //SY(__NR_pivot_root); // (Not yet handled by Valgrind)
 
    // __NR_mincore 218
  //GO(__NR_mincore, ".s .m");
@@ -888,79 +908,81 @@ int main(void)
  //GO(__NR_madvise, ".s .m");
  //SY(__NR_madvise);
 
-   // __NR_getdents64 220 --> sys_getdents64
+   // __NR_getdents64 220
    GO(__NR_getdents64, "3s 1m");
    SY(__NR_getdents64, x0, x0, x0+1);
 
    // __NR_fcntl64 221
- //GO(__NR_fcntl64, ".s .m");
- //SY(__NR_fcntl64);
+   GO(__NR_fcntl64, "3s 0m");
+   SY(__NR_fcntl64, x0, x0, x0);
 
-   // 222 --> sys_ni_syscall()
-   GO(222, "0e");
+   // 222
+   GO(222, "ni");
    SY(222);
 
-   // 223 --> sys_ni_syscall()
-   GO(223, "0e");
+   // 223
+   GO(223, "ni");
    SY(223);
 
    // __NR_gettid 224
-   // (Not yet handled by Valgrind)
+   GO(__NR_gettid, "n/a");
+ //SY(__NR_gettid); // (Not yet handled by Valgrind)
 
    // __NR_readahead 225
- //GO(__NR_readahead, ".s .m");
- //SY(__NR_readahead);
+   GO(__NR_readahead, "n/a");
+ //SY(__NR_readahead); // (Not yet handled by Valgrind)
 
-   // __NR_setxattr 226 --> sys_xattr()
+   // __NR_setxattr 226
    GO(__NR_setxattr, "5s 3m");
    SY(__NR_setxattr, x0, x0, x0, x0+1, x0);
 
-   // __NR_lsetxattr 227 --> sys_lsetxattr()
+   // __NR_lsetxattr 227
    GO(__NR_lsetxattr, "5s 3m");
    SY(__NR_lsetxattr, x0, x0, x0, x0+1, x0);
 
-   // __NR_fsetxattr 228 --> sys_fsetxattr()
+   // __NR_fsetxattr 228
    GO(__NR_fsetxattr, "5s 2m");
    SY(__NR_fsetxattr, x0, x0, x0, x0+1, x0);
 
-   // __NR_getxattr 229 --> sys_getxattr()
+   // __NR_getxattr 229
    GO(__NR_getxattr, "4s 3m");
    SY(__NR_getxattr, x0, x0, x0, x0+1);
 
-   // __NR_lgetxattr 230 --> sys_lgetxattr()
+   // __NR_lgetxattr 230
    GO(__NR_lgetxattr, "4s 3m");
    SY(__NR_lgetxattr, x0, x0, x0, x0+1);
 
-   // __NR_fgetxattr 231 --> sys_fgetxattr()
+   // __NR_fgetxattr 231
    GO(__NR_fgetxattr, "4s 2m");
    SY(__NR_fgetxattr, x0, x0, x0, x0+1);
 
-   // __NR_listxattr 232 --> sys_listxattr()
+   // __NR_listxattr 232
    GO(__NR_listxattr, "3s 2m");
    SY(__NR_listxattr, x0, x0, x0+1);
 
-   // __NR_llistxattr 233 --> sys_llistxattr()
+   // __NR_llistxattr 233
    GO(__NR_llistxattr, "3s 2m");
    SY(__NR_llistxattr, x0, x0, x0+1);
 
-   // __NR_flistxattr 234 --> sys_flistxattr()
+   // __NR_flistxattr 234
    GO(__NR_flistxattr, "3s 1m");
    SY(__NR_flistxattr, x0, x0, x0+1);
 
-   // __NR_removexattr 235 --> sys_removexattr()
+   // __NR_removexattr 235
    GO(__NR_removexattr, "2s 2m");
    SY(__NR_removexattr, x0, x0);
 
-   // __NR_lremovexattr 236 --> sys_lremovexattr()
+   // __NR_lremovexattr 236
    GO(__NR_lremovexattr, "2s 2m");
    SY(__NR_lremovexattr, x0, x0);
 
-   // __NR_fremovexattr 237 --> sys_fremovexattr()
+   // __NR_fremovexattr 237
    GO(__NR_fremovexattr, "2s 1m");
    SY(__NR_fremovexattr, x0, x0);
 
    // __NR_tkill 238
-   // (Not yet handled by Valgrind)
+   GO(__NR_tkill, "n/a");
+ //SY(__NR_tkill); // (Not yet handled by Valgrind)
 
    // __NR_sendfile64 239
  //GO(__NR_sendfile64, ".s .m");
@@ -970,11 +992,11 @@ int main(void)
  //GO(__NR_futex, ".s .m");
  //SY(__NR_futex);
 
-   // __NR_sched_setaffinity 241 --> sched_setaffinity()
+   // __NR_sched_setaffinity 241
    GO(__NR_sched_setaffinity, "3s 1m");
    SY(__NR_sched_setaffinity, x0, x0+1, x0);
 
-   // __NR_sched_getaffinity 242 --> sched_getaffinity()
+   // __NR_sched_getaffinity 242
    GO(__NR_sched_getaffinity, "3s 1m");
    SY(__NR_sched_getaffinity, x0, x0+1, x0);
 
@@ -1007,29 +1029,29 @@ int main(void)
  //SY(__NR_io_cancel);
 
    // __NR_fadvise64 250
- //GO(__NR_fadvise64, ".s .m");
- //SY(__NR_fadvise64);
+   GO(__NR_fadvise64, "n/a");
+ //SY(__NR_fadvise64); // (Not yet handled by Valgrind)
 
-   // 251 --> sys_ni_syscall()
-   GO(251, "0e");
+   // 251
+   GO(251, "ni");
    SY(251);
 
    // __NR_exit_group 252
-   // See below
+   // (XXX: implement in scalar_exit_group)
 
-   // __NR_lookup_dcookie 253 --> sys_lookup_dcookie()
+   // __NR_lookup_dcookie 253
    GO(__NR_lookup_dcookie, "4s 1m");
    SY(__NR_lookup_dcookie, x0, x0, x0, x0+1);
 
-   // __NR_epoll_create 254 --> sys_epoll_create()
+   // __NR_epoll_create 254
    GO(__NR_epoll_create, "1s 0m");
    SY(__NR_epoll_create, x0);
 
-   // __NR_epoll_ctl 255 --> sys_epoll_ctl()
+   // __NR_epoll_ctl 255
    GO(__NR_epoll_ctl, "4s 1m");
    SY(__NR_epoll_ctl, x0, x0, x0, x0);
 
-   // __NR_epoll_wait 256 --> sys_epoll_wait()
+   // __NR_epoll_wait 256
    GO(__NR_epoll_wait, "4s 1m");
    SY(__NR_epoll_wait, x0, x0, x0+1, x0);
 
@@ -1037,7 +1059,7 @@ int main(void)
  //GO(__NR_remap_file_pages, ".s .m");
  //SY(__NR_remap_file_pages);
 
-   // __NR_set_tid_address 258 --> sys_set_tid_address()
+   // __NR_set_tid_address 258
    GO(__NR_set_tid_address, "1s 0m");
    SY(__NR_set_tid_address, x0);
 
@@ -1077,42 +1099,43 @@ int main(void)
  //GO(__NR_clock_nanosleep, ".s .m");
  //SY(__NR_clock_nanosleep);
 
-   // __NR_statfs64 268 --> sys_statfs64()
+   // __NR_statfs64 268
    GO(__NR_statfs64, "3s 2m");
    SY(__NR_statfs64, x0, x0+1, x0);
 
-   // __NR_fstatfs64 269 --> sys_fstatfs64()
+   // __NR_fstatfs64 269
    GO(__NR_fstatfs64, "3s 1m");
    SY(__NR_fstatfs64, x0, x0+1, x0);
 
    // __NR_tgkill 270
-   // (Not yet handled by Valgrind)
+   GO(__NR_tgkill, "n/a");
+ //SY(__NR_tgkill); // (Not yet handled by Valgrind)
 
    // __NR_utimes 271
  //GO(__NR_utimes, ".s .m");
  //SY(__NR_utimes);
 
    // __NR_fadvise64_64 272
- //GO(__NR_fadvise64_64, ".s .m");
- //SY(__NR_fadvise64_64);
+   GO(__NR_fadvise64_64, "n/a");
+ //SY(__NR_fadvise64_64); // (Not yet handled by Valgrind)
 
-   // __NR_vserver 273 --> sys_ni_syscall()
- //GO(__NR_vserver, "0e");
- //SY(__NR_vserver);
+   // __NR_vserver 273
+   GO(__NR_vserver, "ni");
+   SY(__NR_vserver);
 
    // __NR_mbind 274
- //GO(__NR_mbind, ".s .m");
- //SY(__NR_mbind);
+   GO(__NR_mbind, "n/a");
+ //SY(__NR_mbind); // (Not yet handled by Valgrind)
 
    // __NR_get_mempolicy 275
- //GO(__NR_get_mempolicy, ".s .m");
- //SY(__NR_get_mempolicy);
+   GO(__NR_get_mempolicy, "n/a");
+ //SY(__NR_get_mempolicy); // (Not yet handled by Valgrind)
 
    // __NR_set_mempolicy 276
- //GO(__NR_set_mempolicy, ".s .m");
- //SY(__NR_set_mempolicy);
+   GO(__NR_set_mempolicy, "n/a");
+ //SY(__NR_set_mempolicy); // (Not yet handled by Valgrind)
 
-   // __NR_mq_open  277
+   // __NR_mq_open 277
  //GO(__NR_mq_open, ".s .m");
  //SY(__NR_mq_open);
 
@@ -1136,14 +1159,15 @@ int main(void)
  //GO(__NR_mq_getsetattr, ".s .m");
  //SY(__NR_mq_getsetattr);
    
-   // __NR_sys_kexec_load 283 --> sys_ni_syscall()
- //GO(__NR_sys_kexec_load, "0e");
- //SY(__NR_sys_kexec_load);
+   // __NR_sys_kexec_load 283
+   GO(__NR_sys_kexec_load, "ni");
+   SY(__NR_sys_kexec_load);
 
+   // no such syscall...
    GO(9999, "1e");
    SY(9999);
 
-   // __NR_exit 1 --> sys_exit()
+   // __NR_exit 1
    GO(__NR_exit, "1s 0m");
    SY(__NR_exit, x0);
 
diff --git a/memcheck/tests/scalar.stderr.exp b/memcheck/tests/scalar.stderr.exp
index 50239e891f..a3425fe33c 100644
--- a/memcheck/tests/scalar.stderr.exp
+++ b/memcheck/tests/scalar.stderr.exp
@@ -264,7 +264,13 @@ Syscall param chmod(path) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
- 17:          __NR_break 0e
+ 16:         __NR_lchown n/a
+-----------------------------------------------------
+-----------------------------------------------------
+ 17:          __NR_break ni
+-----------------------------------------------------
+-----------------------------------------------------
+ 18:        __NR_oldstat n/a
 -----------------------------------------------------
 -----------------------------------------------------
  19:          __NR_lseek 3s 0m
@@ -359,7 +365,10 @@ Syscall param setuid16(uid) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
- 24:         __NR_getuid 0e
+ 24:         __NR_getuid 0s 0m
+-----------------------------------------------------
+-----------------------------------------------------
+ 25:          __NR_stime n/a
 -----------------------------------------------------
 -----------------------------------------------------
  26:         __NR_ptrace 4s 2m
@@ -398,6 +407,9 @@ Syscall param alarm(seconds) contains uninitialised byte(s)
    at 0x........: syscall (in /...libc...)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
+-----------------------------------------------------
+ 28:       __NR_oldfstat n/a
+-----------------------------------------------------
 -----------------------------------------------------
  30:          __NR_utime 2s 2m
 -----------------------------------------------------
@@ -424,10 +436,10 @@ Syscall param utime(buf) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
- 31:           __NR_stty 0e
+ 31:           __NR_stty ni
 -----------------------------------------------------
 -----------------------------------------------------
- 32:           __NR_gtty 0e
+ 32:           __NR_gtty ni
 -----------------------------------------------------
 -----------------------------------------------------
  33:         __NR_access 2s 1m
@@ -457,10 +469,10 @@ Syscall param nice(inc) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
- 35:          __NR_ftime 0e
+ 35:          __NR_ftime ni
 -----------------------------------------------------
 -----------------------------------------------------
- 36:           __NR_sync 0e
+ 36:           __NR_sync 0s 0m
 -----------------------------------------------------
 -----------------------------------------------------
  37:           __NR_kill 2s 0m
@@ -570,7 +582,7 @@ Syscall param times(buf) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
- 44:           __NR_prof 0e
+ 44:           __NR_prof ni
 -----------------------------------------------------
 -----------------------------------------------------
  45:            __NR_brk 1s 0m
@@ -589,13 +601,16 @@ Syscall param setgid16(gid) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
- 47:         __NR_getgid 0e
+ 47:         __NR_getgid 0s 0m
+-----------------------------------------------------
 -----------------------------------------------------
+ 48:         __NR_signal n/a
 -----------------------------------------------------
- 49:        __NR_geteuid 0e
 -----------------------------------------------------
+ 49:        __NR_geteuid 0s 0m
 -----------------------------------------------------
- 50:        __NR_getegid 0e
+-----------------------------------------------------
+ 50:        __NR_getegid 0s 0m
 -----------------------------------------------------
 -----------------------------------------------------
  51:           __NR_acct 1s 1m
@@ -631,7 +646,7 @@ Syscall param umount2(path) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
- 53:           __NR_lock 0e
+ 53:           __NR_lock ni
 -----------------------------------------------------
 -----------------------------------------------------
  54:          __NR_ioctl 3s 1m
@@ -676,7 +691,7 @@ Syscall param fcntl(arg) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
- 56:            __NR_mpx 0e
+ 56:            __NR_mpx ni
 -----------------------------------------------------
 -----------------------------------------------------
  57:        __NR_setpgid 2s 0m
@@ -692,7 +707,10 @@ Syscall param setpgid(pgid) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
- 58:         __NR_ulimit 0e
+ 58:         __NR_ulimit ni
+-----------------------------------------------------
+-----------------------------------------------------
+ 59:    __NR_oldolduname n/a
 -----------------------------------------------------
 -----------------------------------------------------
  60:          __NR_umask 1s 0m
@@ -716,6 +734,9 @@ Syscall param chroot(path) points to unaddressable byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+-----------------------------------------------------
+ 62:          __NR_ustat n/a
+-----------------------------------------------------
 -----------------------------------------------------
  63:           __NR_dup2 2s 0m
 -----------------------------------------------------
@@ -730,13 +751,13 @@ Syscall param dup2(newfd) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
- 64:        __NR_getppid 0e
+ 64:        __NR_getppid 0s 0m
 -----------------------------------------------------
 -----------------------------------------------------
- 65:        __NR_getpgrp 0e
+ 65:        __NR_getpgrp 0s 0m
 -----------------------------------------------------
 -----------------------------------------------------
- 66:         __NR_setsid 0e
+ 66:         __NR_setsid 0s 0m
 -----------------------------------------------------
 -----------------------------------------------------
  67:      __NR_sigaction 3s 2m
@@ -768,6 +789,12 @@ Syscall param sigaction(oldact) points to unaddressable byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+-----------------------------------------------------
+ 68:       __NR_sgetmask n/a
+-----------------------------------------------------
+-----------------------------------------------------
+ 69:       __NR_ssetmask n/a
+-----------------------------------------------------
 -----------------------------------------------------
  70:       __NR_setreuid 2s 0m
 -----------------------------------------------------
@@ -808,6 +835,9 @@ Syscall param sigpending(set) points to unaddressable byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+-----------------------------------------------------
+ 74:    __NR_sethostname n/a
+-----------------------------------------------------
 -----------------------------------------------------
  75:      __NR_setrlimit 2s 1m
 -----------------------------------------------------
@@ -1010,6 +1040,9 @@ Syscall param symlink(newpath) points to unaddressable byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+-----------------------------------------------------
+ 84:       __NR_oldlstat n/a
+-----------------------------------------------------
 -----------------------------------------------------
  85:       __NR_readlink 3s 2m
 -----------------------------------------------------
@@ -1040,6 +1073,18 @@ Syscall param readlink(buf) points to unaddressable byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+-----------------------------------------------------
+ 86:         __NR_uselib n/a
+-----------------------------------------------------
+-----------------------------------------------------
+ 87:         __NR_swapon n/a
+-----------------------------------------------------
+-----------------------------------------------------
+ 88:         __NR_reboot n/a
+-----------------------------------------------------
+-----------------------------------------------------
+ 89:        __NR_readdir n/a
+-----------------------------------------------------
 -----------------------------------------------------
  90:           __NR_mmap 1s 0m
 -----------------------------------------------------
@@ -1155,6 +1200,9 @@ Syscall param setpriority(prio) contains uninitialised byte(s)
    at 0x........: syscall (in /...libc...)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
+-----------------------------------------------------
+ 98:         __NR_profil ni
+-----------------------------------------------------
 -----------------------------------------------------
  99:         __NR_statfs 2s 2m
 -----------------------------------------------------
@@ -1360,6 +1408,9 @@ Syscall param fstat(buf) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
+109:       __NR_olduname n/a
+-----------------------------------------------------
+-----------------------------------------------------
 110:           __NR_iopl 1s 0m
 -----------------------------------------------------
 
@@ -1368,10 +1419,13 @@ Syscall param iopl(level) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
-111:        __NR_vhangup 0e
+111:        __NR_vhangup 0s 0m
+-----------------------------------------------------
+-----------------------------------------------------
+112:           __NR_idle ni
 -----------------------------------------------------
 -----------------------------------------------------
-112:           __NR_idle 0e
+113:        __NR_vm86old n/a
 -----------------------------------------------------
 -----------------------------------------------------
 114:          __NR_wait4 4s 2m
@@ -1482,6 +1536,9 @@ Syscall param clone(child_tidptr) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
+121:  __NR_setdomainname n/a
+-----------------------------------------------------
+-----------------------------------------------------
 122:          __NR_uname 1s 1m
 -----------------------------------------------------
 
@@ -1514,10 +1571,13 @@ Syscall param mprotect(prot) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
-127:  __NR_create_module 0e
+127:  __NR_create_module ni
+-----------------------------------------------------
 -----------------------------------------------------
+129:  __NR_delete_module n/a
 -----------------------------------------------------
-130:__NR_get_kernel_syms 0e
+-----------------------------------------------------
+130:__NR_get_kernel_syms ni
 -----------------------------------------------------
 -----------------------------------------------------
 131:       __NR_quotactl 4s 1m
@@ -1573,7 +1633,7 @@ Syscall param personality(persona) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
-137:    __NR_afs_syscall 0e
+137:    __NR_afs_syscall ni
 -----------------------------------------------------
 -----------------------------------------------------
 138:       __NR_setfsuid 1s 0m
@@ -1749,7 +1809,7 @@ Syscall param mlockall(flags) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
-153:     __NR_munlockall 0e
+153:     __NR_munlockall 0s 0m
 -----------------------------------------------------
 -----------------------------------------------------
 154: __NR_sched_setparam 2s 1m
@@ -1838,6 +1898,9 @@ Syscall param sched_get_priority_min(policy) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
+161:__NR_sched_rr_get_interval n/a
+-----------------------------------------------------
+-----------------------------------------------------
 162:      __NR_nanosleep 2s 2m
 -----------------------------------------------------
 
@@ -1917,7 +1980,10 @@ Syscall param getresuid16(suid) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
-167:   __NR_query_module 0e
+166:           __NR_vm86 n/a
+-----------------------------------------------------
+-----------------------------------------------------
+167:   __NR_query_module ni
 -----------------------------------------------------
 -----------------------------------------------------
 168:           __NR_poll 3s 1m
@@ -1944,6 +2010,9 @@ Syscall param poll(ufds) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
+169:     __NR_nfsservctl n/a
+-----------------------------------------------------
+-----------------------------------------------------
 170:      __NR_setresgid 3s 0m
 -----------------------------------------------------
 
@@ -1998,6 +2067,9 @@ Syscall param getresgid16(sgid) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
+173:   __NR_rt_sigreturn n/a
+-----------------------------------------------------
+-----------------------------------------------------
 174:   __NR_rt_sigaction 4s 2m
 -----------------------------------------------------
 
@@ -2107,6 +2179,9 @@ Syscall param capset(data) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
+190:          __NR_vfork n/a
+-----------------------------------------------------
+-----------------------------------------------------
 191:     __NR_ugetrlimit 2s 1m
 -----------------------------------------------------
 
@@ -2289,16 +2364,16 @@ Syscall param lchown(path) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
-199:       __NR_getuid32 0e
+199:       __NR_getuid32 0s 0m
 -----------------------------------------------------
 -----------------------------------------------------
-200:       __NR_getgid32 0e
+200:       __NR_getgid32 0s 0m
 -----------------------------------------------------
 -----------------------------------------------------
-201:      __NR_geteuid32 0e
+201:      __NR_geteuid32 0s 0m
 -----------------------------------------------------
 -----------------------------------------------------
-202:      __NR_getegid32 0e
+202:      __NR_getegid32 0s 0m
 -----------------------------------------------------
 -----------------------------------------------------
 203:     __NR_setreuid32 2s 0m
@@ -2547,6 +2622,9 @@ Syscall param setfsgid(gid) contains uninitialised byte(s)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
 -----------------------------------------------------
+217:     __NR_pivot_root n/a
+-----------------------------------------------------
+-----------------------------------------------------
 220:     __NR_getdents64 3s 1m
 -----------------------------------------------------
 
@@ -2571,10 +2649,34 @@ Syscall param getdents64(dirp) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
-222:                 222 0e
+221:        __NR_fcntl64 3s 0m
+-----------------------------------------------------
+
+Syscall param fcntl64(fd) contains uninitialised byte(s)
+   at 0x........: syscall (in /...libc...)
+   by 0x........: __libc_start_main (...libc...)
+   by 0x........: ...
+
+Syscall param fcntl64(cmd) contains uninitialised byte(s)
+   at 0x........: syscall (in /...libc...)
+   by 0x........: __libc_start_main (...libc...)
+   by 0x........: ...
+
+Syscall param fcntl64(arg) contains uninitialised byte(s)
+   at 0x........: syscall (in /...libc...)
+   by 0x........: __libc_start_main (...libc...)
+   by 0x........: ...
+-----------------------------------------------------
+222:                 222 ni
 -----------------------------------------------------
 -----------------------------------------------------
-223:                 223 0e
+223:                 223 ni
+-----------------------------------------------------
+-----------------------------------------------------
+224:         __NR_gettid n/a
+-----------------------------------------------------
+-----------------------------------------------------
+225:      __NR_readahead n/a
 -----------------------------------------------------
 -----------------------------------------------------
 226:       __NR_setxattr 5s 3m
@@ -2979,6 +3081,9 @@ Syscall param fremovexattr(name) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
+238:          __NR_tkill n/a
+-----------------------------------------------------
+-----------------------------------------------------
 241:__NR_sched_setaffinity 3s 1m
 -----------------------------------------------------
 
@@ -3027,7 +3132,10 @@ Syscall param sched_getaffinity(mask) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
-251:                 251 0e
+250:      __NR_fadvise64 n/a
+-----------------------------------------------------
+-----------------------------------------------------
+251:                 251 ni
 -----------------------------------------------------
 -----------------------------------------------------
 253: __NR_lookup_dcookie 4s 1m
@@ -3187,6 +3295,27 @@ Syscall param fstatfs64(buf) points to unaddressable byte(s)
    by 0x........: ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
+270:         __NR_tgkill n/a
+-----------------------------------------------------
+-----------------------------------------------------
+272:   __NR_fadvise64_64 n/a
+-----------------------------------------------------
+-----------------------------------------------------
+273:        __NR_vserver ni
+-----------------------------------------------------
+-----------------------------------------------------
+274:          __NR_mbind n/a
+-----------------------------------------------------
+-----------------------------------------------------
+275:  __NR_get_mempolicy n/a
+-----------------------------------------------------
+-----------------------------------------------------
+276:  __NR_set_mempolicy n/a
+-----------------------------------------------------
+-----------------------------------------------------
+283: __NR_sys_kexec_load ni
+-----------------------------------------------------
+-----------------------------------------------------
 9999:                9999 1e
 -----------------------------------------------------
 WARNING: unhandled syscall: 9999