convert some more, mash some more

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

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index e9b07372d8571d6471fc443698b7305c806f47f9..83e9187da99beca2dc0db70e22c80fbd9486e9d8 100644 (file)
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -666,7 +666,7 @@ void do_hacky_preopened()
    unsigned int count;
    int i;
 
-   if(VG_(getrlimit) (VKI_RLIMIT_NOFILE, &lim) == -1) {
+   if (VG_(getrlimit) (VKI_RLIMIT_NOFILE, &lim) == -1) {
       /* Hmm.  getrlimit() failed.  Now we're screwed, so just choose
          an arbitrarily high number.  1024 happens to be the limit in
          the 2.4 kernels. */
@@ -2412,35 +2412,51 @@ POST(getresuid32)
    }
 }
 
-PRE(getrlimit)
+static void common_post_getrlimit(UWord a1, UWord a2)
 {
-   /* int getrlimit (int resource, struct rlimit *rlim); */
-   PRINT("getrlimit ( %d, %p )", arg1,arg2);
-   PRE_MEM_WRITE( "getrlimit(rlim)", arg2, sizeof(struct vki_rlimit) );
+   POST_MEM_WRITE( a2, sizeof(struct vki_rlimit) );
+
+   switch (a1) {
+   case VKI_RLIMIT_NOFILE:
+      ((struct vki_rlimit *)a2)->rlim_cur = VG_(fd_soft_limit);
+      ((struct vki_rlimit *)a2)->rlim_max = VG_(fd_hard_limit);
+      break;
+
+   case VKI_RLIMIT_DATA:
+      *((struct vki_rlimit *)a2) = VG_(client_rlimit_data);
+      break;
+
+   case VKI_RLIMIT_STACK:
+      *((struct vki_rlimit *)a2) = VG_(client_rlimit_stack);
+      break;
+    }
 }
 
-POST(getrlimit)
+PREx(sys_old_getrlimit, 0)
 {
-    POST_MEM_WRITE( arg2, sizeof(struct vki_rlimit) );
-
-    switch(arg1) {
-    case VKI_RLIMIT_NOFILE:
-       ((struct vki_rlimit *)arg2)->rlim_cur = VG_(fd_soft_limit);
-       ((struct vki_rlimit *)arg2)->rlim_max = VG_(fd_hard_limit);
-       break;
+   PRINT("sys_old_getrlimit ( %d, %p )", arg1,arg2);
+   PRE_REG_READ2(long, "old_getrlimit",
+                 unsigned int, resource, struct rlimit *, rlim);
+   PRE_MEM_WRITE( "old_getrlimit(rlim)", arg2, sizeof(struct vki_rlimit) );
+}
 
-    case VKI_RLIMIT_DATA:
-       *((struct vki_rlimit *)arg2) = VG_(client_rlimit_data);
-       break;
+POSTx(sys_old_getrlimit)
+{
+   common_post_getrlimit(arg1, arg2);
+}
 
-    case VKI_RLIMIT_STACK:
-       *((struct vki_rlimit *)arg2) = VG_(client_rlimit_stack);
-       break;
-    }
+PREx(sys_getrlimit, 0)
+{
+   PRINT("sys_getrlimit ( %d, %p )", arg1,arg2);
+   PRE_REG_READ2(long, "getrlimit",
+                 unsigned int, resource, struct rlimit *, rlim);
+   PRE_MEM_WRITE( "getrlimit(rlim)", arg2, sizeof(struct vki_rlimit) );
 }
 
-PREALIAS(ugetrlimit, getrlimit);
-POSTALIAS(ugetrlimit, getrlimit);
+POSTx(sys_getrlimit)
+{
+   common_post_getrlimit(arg1, arg2);
+}
 
 PRE(getrusage)
 {
@@ -5922,9 +5938,9 @@ static const struct sys_info sys_info[] = {
    SYSXY(__NR_sigpending,       sys_sigpending),   // 73 * P
    //   (__NR_sethostname,      sys_sethostname),  // 74 * (almost P)
 
-   SYSX_(__NR_setrlimit,        sys_setrlimit),    // 75 * (SVr4,BSD4.3)
-   SYSBA(__NR_getrlimit,        sys_old_getrlimit, 0), // 76 *
-   SYSBA(__NR_getrusage,        sys_getrusage, 0), // 77 sys_getrusage *
+   SYSX_(__NR_setrlimit,        sys_setrlimit),       // 75 * (SVr4,BSD4.3)
+   SYSXY(__NR_getrlimit,        sys_old_getrlimit),   // 76 * (SVr4,BSD4.3)
+   SYSBA(__NR_getrusage,        sys_getrusage, 0),    // 77 *
    SYSBA(__NR_gettimeofday,     sys_gettimeofday, 0), // 78 *
    SYSB_(__NR_settimeofday,     sys_settimeofday, 0), // 79 *
 
@@ -5979,7 +5995,7 @@ static const struct sys_info sys_info[] = {
    SYSB_(__NR_clone,            sys_clone, Special), // 120 (very non-gen) L
    //   (__NR_setdomainname,    sys_setdomainname),// 121 * (non-P?)
    SYSXY(__NR_uname,            sys_newuname),     // 122 * P
-   SYSB_(__NR_modify_ldt,       sys_modify_ldt, Special), // 123 sys_modify_ldt (x86,amd64) L
+   SYSB_(__NR_modify_ldt,       sys_modify_ldt, Special), // 123 (x86,amd64) L
    SYSBA(__NR_adjtimex,         sys_adjtimex, 0),  // 124 *
 
    SYSBA(__NR_mprotect,         sys_mprotect, 0),  // 125 *
@@ -6064,7 +6080,7 @@ static const struct sys_info sys_info[] = {
 
    // Nb: we convert vfork() to fork() in VG_(pre_syscall)().
    //   (__NR_vfork,            sys_vfork),        // 190 -- Valgrind avoids
-   SYSBA(__NR_ugetrlimit,       sys_getrlimit, 0), // 191 *
+   SYSXY(__NR_ugetrlimit,       sys_getrlimit),    // 191 * (?)
    SYSBA(__NR_mmap2,            sys_mmap2, 0),     // 192 
    SYSB_(__NR_truncate64,       sys_truncate64, MayBlock),   // 193 %%
    SYSB_(__NR_ftruncate64,      sys_ftruncate64, MayBlock), // 194 %%

diff --git a/memcheck/tests/scalar.c b/memcheck/tests/scalar.c
index 59e1061fa5eff9e3aab589e9679b051d693c6162..5a42b2570e0ea41d9b8df197613f384d9ba58347 100644 (file)
--- a/memcheck/tests/scalar.c
+++ b/memcheck/tests/scalar.c
@@ -304,42 +304,42 @@ int main(void)
    SY(__NR_setrlimit, x0, x0);
 
    // __NR_getrlimit 76
- //GO(__NR_getrlimit, ".m .s");
- //SY(__NR_getrlimit);
+   GO(__NR_getrlimit, "2s 1m");
+   SY(__NR_getrlimit, x0, x0);
 
    // __NR_getrusage 77
- //GO(__NR_getrusage, ".m .s");
+ //GO(__NR_getrusage, ".s .m");
  //SY(__NR_getrusage);
 
    // __NR_gettimeofday 78
- //GO(__NR_gettimeofday, ".m .s");
+ //GO(__NR_gettimeofday, ".s .m");
  //SY(__NR_gettimeofday);
 
    // __NR_settimeofday 79
- //GO(__NR_settimeofday, ".m .s");
+ //GO(__NR_settimeofday, ".s .m");
  //SY(__NR_settimeofday);
 
    // __NR_getgroups 80
- //GO(__NR_getgroups, ".m .s");
+ //GO(__NR_getgroups, ".s .m");
  //SY(__NR_getgroups);
 
    // __NR_setgroups 81
- //GO(__NR_setgroups, ".m .s");
+ //GO(__NR_setgroups, ".s .m");
  //SY(__NR_setgroups);
 
    // __NR_select 82
- //GO(__NR_select, ".m .s");
+ //GO(__NR_select, ".s .m");
  //SY(__NR_select);
 
    // __NR_symlink 83
- //GO(__NR_symlink, ".m .s");
+ //GO(__NR_symlink, ".s .m");
  //SY(__NR_symlink);
 
    // __NR_oldlstat 84
    // (obsolete, not handled by Valgrind)
 
    // __NR_readlink 85
- //GO(__NR_readlink, ".m .s");
+ //GO(__NR_readlink, ".s .m");
  //SY(__NR_readlink);
 
    // __NR_uselib 86
@@ -355,86 +355,86 @@ int main(void)
    // (superseded, not handled by Valgrind)
 
    // __NR_mmap 90
- //GO(__NR_mmap, ".m .s");
+ //GO(__NR_mmap, ".s .m");
  //SY(__NR_mmap);
 
    // __NR_munmap 91
- //GO(__NR_munmap, ".m .s");
+ //GO(__NR_munmap, ".s .m");
  //SY(__NR_munmap);
 
    // __NR_truncate 92
- //GO(__NR_truncate, ".m .s");
+ //GO(__NR_truncate, ".s .m");
  //SY(__NR_truncate);
 
    // __NR_ftruncate 93
- //GO(__NR_ftruncate, ".m .s");
+ //GO(__NR_ftruncate, ".s .m");
  //SY(__NR_ftruncate);
 
    // __NR_fchmod 94
- //GO(__NR_fchmod, ".m .s");
+ //GO(__NR_fchmod, ".s .m");
  //SY(__NR_fchmod);
 
    // __NR_fchown 95
- //GO(__NR_fchown, ".m .s");
+ //GO(__NR_fchown, ".s .m");
  //SY(__NR_fchown);
 
    // __NR_getpriority 96
- //GO(__NR_getpriority, ".m .s");
+ //GO(__NR_getpriority, ".s .m");
  //SY(__NR_getpriority);
 
    // __NR_setpriority 97
- //GO(__NR_setpriority, ".m .s");
+ //GO(__NR_setpriority, ".s .m");
  //SY(__NR_setpriority);
 
    // __NR_profil 98
- //GO(__NR_profil, ".m .s");
+ //GO(__NR_profil, ".s .m");
  //SY(__NR_profil);
 
    // __NR_statfs 99
- //GO(__NR_statfs, ".m .s");
+ //GO(__NR_statfs, ".s .m");
  //SY(__NR_statfs);
 
    // __NR_fstatfs 100
- //GO(__NR_fstatfs, ".m .s");
+ //GO(__NR_fstatfs, ".s .m");
  //SY(__NR_fstatfs);
 
    // __NR_ioperm 101
- //GO(__NR_ioperm, ".m .s");
+ //GO(__NR_ioperm, ".s .m");
  //SY(__NR_ioperm);
 
    // __NR_socketcall 102
- //GO(__NR_socketcall, ".m .s");
+ //GO(__NR_socketcall, ".s .m");
  //SY(__NR_socketcall);
 
    // __NR_syslog 103
- //GO(__NR_syslog, ".m .s");
+ //GO(__NR_syslog, ".s .m");
  //SY(__NR_syslog);
 
    // __NR_setitimer 104
- //GO(__NR_setitimer, ".m .s");
+ //GO(__NR_setitimer, ".s .m");
  //SY(__NR_setitimer);
 
    // __NR_getitimer 105
- //GO(__NR_getitimer, ".m .s");
+ //GO(__NR_getitimer, ".s .m");
  //SY(__NR_getitimer);
 
    // __NR_stat 106
- //GO(__NR_stat, ".m .s");
+ //GO(__NR_stat, ".s .m");
  //SY(__NR_stat);
 
    // __NR_lstat 107
- //GO(__NR_lstat, ".m .s");
+ //GO(__NR_lstat, ".s .m");
  //SY(__NR_lstat);
 
    // __NR_fstat 108
- //GO(__NR_fstat, ".m .s");
+ //GO(__NR_fstat, ".s .m");
  //SY(__NR_fstat);
 
    // __NR_olduname 109
    // (obsolete, not handled by Valgrind)
 
    // __NR_iopl 110
- //GO(__NR_iopl, ".m .s");
+ //GO(__NR_iopl, ".s .m");
  //SY(__NR_iopl);
 
    // __NR_vhangup 111 --> sys_vhangup()
@@ -446,39 +446,39 @@ int main(void)
    SY(__NR_idle);
 
    // __NR_vm86old 113
- //GO(__NR_vm86old, ".m .s");
+ //GO(__NR_vm86old, ".s .m");
  //SY(__NR_vm86old);
 
    // __NR_wait4 114
- //GO(__NR_wait4, ".m .s");
+ //GO(__NR_wait4, ".s .m");
  //SY(__NR_wait4);
 
    // __NR_swapoff 115
- //GO(__NR_swapoff, ".m .s");
+ //GO(__NR_swapoff, ".s .m");
  //SY(__NR_swapoff);
 
    // __NR_sysinfo 116
- //GO(__NR_sysinfo, ".m .s");
+ //GO(__NR_sysinfo, ".s .m");
  //SY(__NR_sysinfo);
 
    // __NR_ipc 117
- //GO(__NR_ipc, ".m .s");
+ //GO(__NR_ipc, ".s .m");
  //SY(__NR_ipc);
 
    // __NR_fsync 118
- //GO(__NR_fsync, ".m .s");
+ //GO(__NR_fsync, ".s .m");
  //SY(__NR_fsync);
 
    // __NR_sigreturn 119
- //GO(__NR_sigreturn, ".m .s");
+ //GO(__NR_sigreturn, ".s .m");
  //SY(__NR_sigreturn);
 
    // __NR_clone 120
- //GO(__NR_clone, ".m .s");
+ //GO(__NR_clone, ".s .m");
  //SY(__NR_clone);
 
    // __NR_setdomainname 121
- //GO(__NR_setdomainname, ".m .s");
+ //GO(__NR_setdomainname, ".s .m");
  //SY(__NR_setdomainname);
 
    // __NR_uname 122
@@ -486,19 +486,19 @@ int main(void)
    SY(__NR_uname, x0);
 
    // __NR_modify_ldt 123
- //GO(__NR_modify_ldt, ".m .s");
+ //GO(__NR_modify_ldt, ".s .m");
  //SY(__NR_modify_ldt);
 
    // __NR_adjtimex 124
- //GO(__NR_adjtimex, ".m .s");
+ //GO(__NR_adjtimex, ".s .m");
  //SY(__NR_adjtimex);
 
    // __NR_mprotect 125
- //GO(__NR_mprotect, ".m .s");
+ //GO(__NR_mprotect, ".s .m");
  //SY(__NR_mprotect);
 
    // __NR_sigprocmask 126
- //GO(__NR_sigprocmask, ".m .s");
+ //GO(__NR_sigprocmask, ".s .m");
  //SY(__NR_sigprocmask);
 
    // __NR_create_module 127 --> sys_ni_syscall()
@@ -506,11 +506,11 @@ int main(void)
    SY(__NR_create_module);
 
    // __NR_init_module 128
- //GO(__NR_init_module, ".m .s");
+ //GO(__NR_init_module, ".s .m");
  //SY(__NR_init_module);
 
    // __NR_delete_module 129
- //GO(__NR_delete_module, ".m .s");
+ //GO(__NR_delete_module, ".s .m");
  //SY(__NR_delete_module);
 
    // __NR_get_kernel_syms 130 --> sys_ni_syscall()
@@ -518,27 +518,27 @@ int main(void)
    SY(__NR_get_kernel_syms);
 
    // __NR_quotactl 131
- //GO(__NR_quotactl, ".m .s");
+ //GO(__NR_quotactl, ".s .m");
  //SY(__NR_quotactl);
 
    // __NR_getpgid 132
- //GO(__NR_getpgid, ".m .s");
+ //GO(__NR_getpgid, ".s .m");
  //SY(__NR_getpgid);
 
    // __NR_fchdir 133
- //GO(__NR_fchdir, ".m .s");
+ //GO(__NR_fchdir, ".s .m");
  //SY(__NR_fchdir);
 
    // __NR_bdflush 134
- //GO(__NR_bdflush, ".m .s");
+ //GO(__NR_bdflush, ".s .m");
  //SY(__NR_bdflush);
 
    // __NR_sysfs 135
- //GO(__NR_sysfs, ".m .s");
+ //GO(__NR_sysfs, ".s .m");
  //SY(__NR_sysfs);
 
    // __NR_personality 136
- //GO(__NR_personality, ".m .s");
+ //GO(__NR_personality, ".s .m");
  //SY(__NR_personality);
 
    // __NR_afs_syscall 137 --> sys_ni_syscall()
@@ -546,63 +546,63 @@ int main(void)
    SY(__NR_afs_syscall);
 
    // __NR_setfsuid 138
- //GO(__NR_setfsuid, ".m .s");
+ //GO(__NR_setfsuid, ".s .m");
  //SY(__NR_setfsuid);
 
    // __NR_setfsgid 139
- //GO(__NR_setfsgid, ".m .s");
+ //GO(__NR_setfsgid, ".s .m");
  //SY(__NR_setfsgid);
 
    // __NR__llseek 140
- //GO(__NR__llseek, ".m .s");
+ //GO(__NR__llseek, ".s .m");
  //SY(__NR__llseek);
 
    // __NR_getdents 141
- //GO(__NR_getdents, ".m .s");
+ //GO(__NR_getdents, ".s .m");
  //SY(__NR_getdents);
 
    // __NR__newselect 142
- //GO(__NR__newselect, ".m .s");
+ //GO(__NR__newselect, ".s .m");
  //SY(__NR__newselect);
 
    // __NR_flock 143
- //GO(__NR_flock, ".m .s");
+ //GO(__NR_flock, ".s .m");
  //SY(__NR_flock);
 
    // __NR_msync 144
- //GO(__NR_msync, ".m .s");
+ //GO(__NR_msync, ".s .m");
  //SY(__NR_msync);
 
    // __NR_readv 145
- //GO(__NR_readv, ".m .s");
+ //GO(__NR_readv, ".s .m");
  //SY(__NR_readv);
 
    // __NR_writev 146
- //GO(__NR_writev, ".m .s");
+ //GO(__NR_writev, ".s .m");
  //SY(__NR_writev);
 
    // __NR_getsid 147
- //GO(__NR_getsid, ".m .s");
+ //GO(__NR_getsid, ".s .m");
  //SY(__NR_getsid);
 
    // __NR_fdatasync 148
- //GO(__NR_fdatasync, ".m .s");
+ //GO(__NR_fdatasync, ".s .m");
  //SY(__NR_fdatasync);
 
    // __NR__sysctl 149
- //GO(__NR__sysctl, ".m .s");
+ //GO(__NR__sysctl, ".s .m");
  //SY(__NR__sysctl);
 
    // __NR_mlock 150
- //GO(__NR_mlock, ".m .s");
+ //GO(__NR_mlock, ".s .m");
  //SY(__NR_mlock);
 
    // __NR_munlock 151
- //GO(__NR_munlock, ".m .s");
+ //GO(__NR_munlock, ".s .m");
  //SY(__NR_munlock);
 
    // __NR_mlockall 152
- //GO(__NR_mlockall, ".m .s");
+ //GO(__NR_mlockall, ".s .m");
  //SY(__NR_mlockall);
 
    // __NR_munlockall 153 --> sys_munlockall()
@@ -610,55 +610,55 @@ int main(void)
    SY(__NR_munlockall);
 
    // __NR_sched_setparam 154
- //GO(__NR_sched_setparam, ".m .s");
+ //GO(__NR_sched_setparam, ".s .m");
  //SY(__NR_sched_setparam);
 
    // __NR_sched_getparam 155
- //GO(__NR_sched_getparam, ".m .s");
+ //GO(__NR_sched_getparam, ".s .m");
  //SY(__NR_sched_getparam);
 
    // __NR_sched_setscheduler 156
- //GO(__NR_sched_setscheduler, ".m .s");
+ //GO(__NR_sched_setscheduler, ".s .m");
  //SY(__NR_sched_setscheduler);
 
    // __NR_sched_getscheduler 157
- //GO(__NR_sched_getscheduler, ".m .s");
+ //GO(__NR_sched_getscheduler, ".s .m");
  //SY(__NR_sched_getscheduler);
 
    // __NR_sched_yield 158
- //GO(__NR_sched_yield, ".m .s");
+ //GO(__NR_sched_yield, ".s .m");
  //SY(__NR_sched_yield);
 
    // __NR_sched_get_priority_max 159
- //GO(__NR_sched_get_priority_max, ".m .s");
+ //GO(__NR_sched_get_priority_max, ".s .m");
  //SY(__NR_sched_get_priority_max);
 
    // __NR_sched_get_priority_min 160
- //GO(__NR_sched_get_priority_min, ".m .s");
+ //GO(__NR_sched_get_priority_min, ".s .m");
  //SY(__NR_sched_get_priority_min);
 
    // __NR_sched_rr_get_interval 161
- //GO(__NR_sched_rr_get_interval, ".m .s");
+ //GO(__NR_sched_rr_get_interval, ".s .m");
  //SY(__NR_sched_rr_get_interval);
 
    // __NR_nanosleep 162
- //GO(__NR_nanosleep, ".m .s");
+ //GO(__NR_nanosleep, ".s .m");
  //SY(__NR_nanosleep);
 
    // __NR_mremap 163
- //GO(__NR_mremap, ".m .s");
+ //GO(__NR_mremap, ".s .m");
  //SY(__NR_mremap);
 
    // __NR_setresuid 164
- //GO(__NR_setresuid, ".m .s");
+ //GO(__NR_setresuid, ".s .m");
  //SY(__NR_setresuid);
 
    // __NR_getresuid 165
- //GO(__NR_getresuid, ".m .s");
+ //GO(__NR_getresuid, ".s .m");
  //SY(__NR_getresuid);
 
    // __NR_vm86 166
- //GO(__NR_vm86, ".m .s");
+ //GO(__NR_vm86, ".s .m");
  //SY(__NR_vm86);
 
    // __NR_query_module 167 --> sys_ni_syscall()
@@ -666,127 +666,127 @@ int main(void)
    SY(__NR_query_module);
 
    // __NR_poll 168
- //GO(__NR_poll, ".m .s");
+ //GO(__NR_poll, ".s .m");
  //SY(__NR_poll);
 
    // __NR_nfsservctl 169
- //GO(__NR_nfsservctl, ".m .s");
+ //GO(__NR_nfsservctl, ".s .m");
  //SY(__NR_nfsservctl);
 
    // __NR_setresgid 170
- //GO(__NR_setresgid, ".m .s");
+ //GO(__NR_setresgid, ".s .m");
  //SY(__NR_setresgid);
 
    // __NR_getresgid 171
- //GO(__NR_getresgid, ".m .s");
+ //GO(__NR_getresgid, ".s .m");
  //SY(__NR_getresgid);
 
    // __NR_prctl              172
- //GO(__NR_prctl, ".m .s");
+ //GO(__NR_prctl, ".s .m");
  //SY(__NR_prctl);
 
    // __NR_rt_sigreturn 173
- //GO(__NR_rt_sigreturn, ".m .s");
+ //GO(__NR_rt_sigreturn, ".s .m");
  //SY(__NR_rt_sigreturn);
 
    // __NR_rt_sigaction 174
- //GO(__NR_rt_sigaction, ".m .s");
+ //GO(__NR_rt_sigaction, ".s .m");
  //SY(__NR_rt_sigaction);
 
    // __NR_rt_sigprocmask 175
- //GO(__NR_rt_sigprocmask, ".m .s");
+ //GO(__NR_rt_sigprocmask, ".s .m");
  //SY(__NR_rt_sigprocmask);
 
    // __NR_rt_sigpending 176
- //GO(__NR_rt_sigpending, ".m .s");
+ //GO(__NR_rt_sigpending, ".s .m");
  //SY(__NR_rt_sigpending);
 
    // __NR_rt_sigtimedwait 177
- //GO(__NR_rt_sigtimedwait, ".m .s");
+ //GO(__NR_rt_sigtimedwait, ".s .m");
  //SY(__NR_rt_sigtimedwait);
 
    // __NR_rt_sigqueueinfo 178
- //GO(__NR_rt_sigqueueinfo, ".m .s");
+ //GO(__NR_rt_sigqueueinfo, ".s .m");
  //SY(__NR_rt_sigqueueinfo);
 
    // __NR_rt_sigsuspend 179
- //GO(__NR_rt_sigsuspend, ".m .s");
+ //GO(__NR_rt_sigsuspend, ".s .m");
  //SY(__NR_rt_sigsuspend);
 
    // __NR_pread64 180
- //GO(__NR_pread64, ".m .s");
+ //GO(__NR_pread64, ".s .m");
  //SY(__NR_pread64);
 
    // __NR_pwrite64 181
- //GO(__NR_pwrite64, ".m .s");
+ //GO(__NR_pwrite64, ".s .m");
  //SY(__NR_pwrite64);
 
    // __NR_chown 182
- //GO(__NR_chown, ".m .s");
+ //GO(__NR_chown, ".s .m");
  //SY(__NR_chown);
 
    // __NR_getcwd 183
- //GO(__NR_getcwd, ".m .s");
+ //GO(__NR_getcwd, ".s .m");
  //SY(__NR_getcwd);
 
    // __NR_capget 184
- //GO(__NR_capget, ".m .s");
+ //GO(__NR_capget, ".s .m");
  //SY(__NR_capget);
 
    // __NR_capset 185
- //GO(__NR_capset, ".m .s");
+ //GO(__NR_capset, ".s .m");
  //SY(__NR_capset);
 
    // __NR_sigaltstack 186
- //GO(__NR_sigaltstack, ".m .s");
+ //GO(__NR_sigaltstack, ".s .m");
  //SY(__NR_sigaltstack);
 
    // __NR_sendfile 187
- //GO(__NR_sendfile, ".m .s");
+ //GO(__NR_sendfile, ".s .m");
  //SY(__NR_sendfile);
 
    // __NR_getpmsg 188
- //GO(__NR_getpmsg, ".m .s");
+ //GO(__NR_getpmsg, ".s .m");
  //SY(__NR_getpmsg);
 
    // __NR_putpmsg 189
- //GO(__NR_putpmsg, ".m .s");
+ //GO(__NR_putpmsg, ".s .m");
  //SY(__NR_putpmsg);
 
    // __NR_vfork 190
- //GO(__NR_vfork, ".m .s");
+ //GO(__NR_vfork, ".s .m");
  //SY(__NR_vfork);
 
    // __NR_ugetrlimit 191
- //GO(__NR_ugetrlimit, ".m .s");
- //SY(__NR_ugetrlimit);
+   GO(__NR_ugetrlimit, "2s 1m");
+   SY(__NR_ugetrlimit, x0, x0);
 
    // __NR_mmap2 192
- //GO(__NR_mmap2, ".m .s");
+ //GO(__NR_mmap2, ".s .m");
  //SY(__NR_mmap2);
 
    // __NR_truncate64 193
- //GO(__NR_truncate64, ".m .s");
+ //GO(__NR_truncate64, ".s .m");
  //SY(__NR_truncate64);
 
    // __NR_ftruncate64 194
- //GO(__NR_ftruncate64, ".m .s");
+ //GO(__NR_ftruncate64, ".s .m");
  //SY(__NR_ftruncate64);
 
    // __NR_stat64 195
- //GO(__NR_stat64, ".m .s");
+ //GO(__NR_stat64, ".s .m");
  //SY(__NR_stat64);
 
    // __NR_lstat64 196
- //GO(__NR_lstat64, ".m .s");
+ //GO(__NR_lstat64, ".s .m");
  //SY(__NR_lstat64);
 
    // __NR_fstat64 197
- //GO(__NR_fstat64, ".m .s");
+ //GO(__NR_fstat64, ".s .m");
  //SY(__NR_fstat64);
 
    // __NR_lchown32 198
- //GO(__NR_lchown32, ".m .s");
+ //GO(__NR_lchown32, ".s .m");
  //SY(__NR_lchown32);
 
    // __NR_getuid32 199 --> sys_getuid()
@@ -814,35 +814,35 @@ int main(void)
    SY(__NR_setregid32, x0, x0);
 
    // __NR_getgroups32 205
- //GO(__NR_getgroups32, ".m .s");
+ //GO(__NR_getgroups32, ".s .m");
  //SY(__NR_getgroups32);
 
    // __NR_setgroups32 206
- //GO(__NR_setgroups32, ".m .s");
+ //GO(__NR_setgroups32, ".s .m");
  //SY(__NR_setgroups32);
 
    // __NR_fchown32 207
- //GO(__NR_fchown32, ".m .s");
+ //GO(__NR_fchown32, ".s .m");
  //SY(__NR_fchown32);
 
    // __NR_setresuid32 208
- //GO(__NR_setresuid32, ".m .s");
+ //GO(__NR_setresuid32, ".s .m");
  //SY(__NR_setresuid32);
 
    // __NR_getresuid32 209
- //GO(__NR_getresuid32, ".m .s");
+ //GO(__NR_getresuid32, ".s .m");
  //SY(__NR_getresuid32);
 
    // __NR_setresgid32 210
- //GO(__NR_setresgid32, ".m .s");
+ //GO(__NR_setresgid32, ".s .m");
  //SY(__NR_setresgid32);
 
    // __NR_getresgid32 211
- //GO(__NR_getresgid32, ".m .s");
+ //GO(__NR_getresgid32, ".s .m");
  //SY(__NR_getresgid32);
 
    // __NR_chown32 212
- //GO(__NR_chown32, ".m .s");
+ //GO(__NR_chown32, ".s .m");
  //SY(__NR_chown32);
 
    // __NR_setuid32 213 --> sys_setuid()
@@ -854,31 +854,31 @@ int main(void)
    SY(__NR_setgid32);
 
    // __NR_setfsuid32 215
- //GO(__NR_setfsuid32, ".m .s");
+ //GO(__NR_setfsuid32, ".s .m");
  //SY(__NR_setfsuid32);
 
    // __NR_setfsgid32 216
- //GO(__NR_setfsgid32, ".m .s");
+ //GO(__NR_setfsgid32, ".s .m");
  //SY(__NR_setfsgid32);
 
    // __NR_pivot_root 217
- //GO(__NR_pivot_root, ".m .s");
+ //GO(__NR_pivot_root, ".s .m");
  //SY(__NR_pivot_root);
 
    // __NR_mincore 218
- //GO(__NR_mincore, ".m .s");
+ //GO(__NR_mincore, ".s .m");
  //SY(__NR_mincore);
 
    // __NR_madvise 219
- //GO(__NR_madvise, ".m .s");
+ //GO(__NR_madvise, ".s .m");
  //SY(__NR_madvise);
 
    // __NR_getdents64 220
- //GO(__NR_getdents64, ".m .s");
+ //GO(__NR_getdents64, ".s .m");
  //SY(__NR_getdents64);
 
    // __NR_fcntl64 221
- //GO(__NR_fcntl64, ".m .s");
+ //GO(__NR_fcntl64, ".s .m");
  //SY(__NR_fcntl64);
 
    // 222 --> sys_ni_syscall()
@@ -890,111 +890,111 @@ int main(void)
    SY(223);
 
    // __NR_gettid 224
- //GO(__NR_gettid, ".m .s");
+ //GO(__NR_gettid, ".s .m");
  //SY(__NR_gettid);
 
    // __NR_readahead 225
- //GO(__NR_readahead, ".m .s");
+ //GO(__NR_readahead, ".s .m");
  //SY(__NR_readahead);
 
    // __NR_setxattr 226
- //GO(__NR_setxattr, ".m .s");
+ //GO(__NR_setxattr, ".s .m");
  //SY(__NR_setxattr);
 
    // __NR_lsetxattr 227
- //GO(__NR_lsetxattr, ".m .s");
+ //GO(__NR_lsetxattr, ".s .m");
  //SY(__NR_lsetxattr);
 
    // __NR_fsetxattr 228
- //GO(__NR_fsetxattr, ".m .s");
+ //GO(__NR_fsetxattr, ".s .m");
  //SY(__NR_fsetxattr);
 
    // __NR_getxattr 229
- //GO(__NR_getxattr, ".m .s");
+ //GO(__NR_getxattr, ".s .m");
  //SY(__NR_getxattr);
 
    // __NR_lgetxattr 230
- //GO(__NR_lgetxattr, ".m .s");
+ //GO(__NR_lgetxattr, ".s .m");
  //SY(__NR_lgetxattr);
 
    // __NR_fgetxattr 231
- //GO(__NR_fgetxattr, ".m .s");
+ //GO(__NR_fgetxattr, ".s .m");
  //SY(__NR_fgetxattr);
 
    // __NR_listxattr 232
- //GO(__NR_listxattr, ".m .s");
+ //GO(__NR_listxattr, ".s .m");
  //SY(__NR_listxattr);
 
    // __NR_llistxattr 233
- //GO(__NR_llistxattr, ".m .s");
+ //GO(__NR_llistxattr, ".s .m");
  //SY(__NR_llistxattr);
 
    // __NR_flistxattr 234
- //GO(__NR_flistxattr, ".m .s");
+ //GO(__NR_flistxattr, ".s .m");
  //SY(__NR_flistxattr);
 
    // __NR_removexattr 235
- //GO(__NR_removexattr, ".m .s");
+ //GO(__NR_removexattr, ".s .m");
  //SY(__NR_removexattr);
 
    // __NR_lremovexattr 236
- //GO(__NR_lremovexattr, ".m .s");
+ //GO(__NR_lremovexattr, ".s .m");
  //SY(__NR_lremovexattr);
 
    // __NR_fremovexattr 237
- //GO(__NR_fremovexattr, ".m .s");
+ //GO(__NR_fremovexattr, ".s .m");
  //SY(__NR_fremovexattr);
 
    // __NR_tkill 238
- //GO(__NR_tkill, ".m .s");
+ //GO(__NR_tkill, ".s .m");
  //SY(__NR_tkill);
 
    // __NR_sendfile64 239
- //GO(__NR_sendfile64, ".m .s");
+ //GO(__NR_sendfile64, ".s .m");
  //SY(__NR_sendfile64);
 
    // __NR_futex 240
- //GO(__NR_futex, ".m .s");
+ //GO(__NR_futex, ".s .m");
  //SY(__NR_futex);
 
    // __NR_sched_setaffinity 241
- //GO(__NR_sched_setaffinity, ".m .s");
+ //GO(__NR_sched_setaffinity, ".s .m");
  //SY(__NR_sched_setaffinity);
 
    // __NR_sched_getaffinity 242
- //GO(__NR_sched_getaffinity, ".m .s");
+ //GO(__NR_sched_getaffinity, ".s .m");
  //SY(__NR_sched_getaffinity);
 
    // __NR_set_thread_area 243
- //GO(__NR_set_thread_area, ".m .s");
+ //GO(__NR_set_thread_area, ".s .m");
  //SY(__NR_set_thread_area);
 
    // __NR_get_thread_area 244
- //GO(__NR_get_thread_area, ".m .s");
+ //GO(__NR_get_thread_area, ".s .m");
  //SY(__NR_get_thread_area);
 
    // __NR_io_setup 245
- //GO(__NR_io_setup, ".m .s");
+ //GO(__NR_io_setup, ".s .m");
  //SY(__NR_io_setup);
 
    // __NR_io_destroy 246
- //GO(__NR_io_destroy, ".m .s");
+ //GO(__NR_io_destroy, ".s .m");
  //SY(__NR_io_destroy);
 
    // __NR_io_getevents 247
- //GO(__NR_io_getevents, ".m .s");
+ //GO(__NR_io_getevents, ".s .m");
  //SY(__NR_io_getevents);
 
    // __NR_io_submit 248
- //GO(__NR_io_submit, ".m .s");
+ //GO(__NR_io_submit, ".s .m");
  //SY(__NR_io_submit);
 
    // __NR_io_cancel 249
- //GO(__NR_io_cancel, ".m .s");
+ //GO(__NR_io_cancel, ".s .m");
  //SY(__NR_io_cancel);
 
    // __NR_fadvise64 250
- //GO(__NR_fadvise64, ".m .s");
+ //GO(__NR_fadvise64, ".s .m");
  //SY(__NR_fadvise64);
 
    // 251 --> sys_ni_syscall()
@@ -1008,79 +1008,79 @@ int main(void)
    SY(__NR_lookup_dcookie, x0, x0, x0, x0+1);
 
    // __NR_epoll_create 254
- //GO(__NR_epoll_create, ".m .s");
+ //GO(__NR_epoll_create, ".s .m");
  //SY(__NR_epoll_create);
 
    // __NR_epoll_ctl 255
- //GO(__NR_epoll_ctl, ".m .s");
+ //GO(__NR_epoll_ctl, ".s .m");
  //SY(__NR_epoll_ctl);
 
    // __NR_epoll_wait 256
- //GO(__NR_epoll_wait, ".m .s");
+ //GO(__NR_epoll_wait, ".s .m");
  //SY(__NR_epoll_wait);
 
    // __NR_remap_file_pages 257
- //GO(__NR_remap_file_pages, ".m .s");
+ //GO(__NR_remap_file_pages, ".s .m");
  //SY(__NR_remap_file_pages);
 
    // __NR_set_tid_address 258
- //GO(__NR_set_tid_address, ".m .s");
+ //GO(__NR_set_tid_address, ".s .m");
  //SY(__NR_set_tid_address);
 
    // __NR_timer_create 259
- //GO(__NR_timer_create, ".m .s");
+ //GO(__NR_timer_create, ".s .m");
  //SY(__NR_timer_create);
 
    // __NR_timer_settime (__NR_timer_create+1)
- //GO(__NR_timer_settime, ".m .s");
+ //GO(__NR_timer_settime, ".s .m");
  //SY(__NR_timer_settime);
 
    // __NR_timer_gettime (__NR_timer_create+2)
- //GO(__NR_timer_gettime, ".m .s");
+ //GO(__NR_timer_gettime, ".s .m");
  //SY(__NR_timer_gettime);
 
    // __NR_timer_getoverrun (__NR_timer_create+3)
- //GO(__NR_timer_getoverrun, ".m .s");
+ //GO(__NR_timer_getoverrun, ".s .m");
  //SY(__NR_timer_getoverrun);
 
    // __NR_timer_delete (__NR_timer_create+4)
- //GO(__NR_timer_delete, ".m .s");
+ //GO(__NR_timer_delete, ".s .m");
  //SY(__NR_timer_delete);
 
    // __NR_clock_settime (__NR_timer_create+5)
- //GO(__NR_clock_settime, ".m .s");
+ //GO(__NR_clock_settime, ".s .m");
  //SY(__NR_clock_settime);
 
    // __NR_clock_gettime (__NR_timer_create+6)
- //GO(__NR_clock_gettime, ".m .s");
+ //GO(__NR_clock_gettime, ".s .m");
  //SY(__NR_clock_gettime);
 
    // __NR_clock_getres (__NR_timer_create+7)
- //GO(__NR_clock_getres, ".m .s");
+ //GO(__NR_clock_getres, ".s .m");
  //SY(__NR_clock_getres);
 
    // __NR_clock_nanosleep (__NR_timer_create+8)
- //GO(__NR_clock_nanosleep, ".m .s");
+ //GO(__NR_clock_nanosleep, ".s .m");
  //SY(__NR_clock_nanosleep);
 
    // __NR_statfs64 268
- //GO(__NR_statfs64, ".m .s");
+ //GO(__NR_statfs64, ".s .m");
  //SY(__NR_statfs64);
 
    // __NR_fstatfs64 269
- //GO(__NR_fstatfs64, ".m .s");
+ //GO(__NR_fstatfs64, ".s .m");
  //SY(__NR_fstatfs64);
 
    // __NR_tgkill 270
- //GO(__NR_tgkill, ".m .s");
+ //GO(__NR_tgkill, ".s .m");
  //SY(__NR_tgkill);
 
    // __NR_utimes 271
- //GO(__NR_utimes, ".m .s");
+ //GO(__NR_utimes, ".s .m");
  //SY(__NR_utimes);
 
    // __NR_fadvise64_64 272
- //GO(__NR_fadvise64_64, ".m .s");
+ //GO(__NR_fadvise64_64, ".s .m");
  //SY(__NR_fadvise64_64);
 
    // __NR_vserver 273 --> sys_ni_syscall()
@@ -1088,39 +1088,39 @@ int main(void)
  //SY(__NR_vserver);
 
    // __NR_mbind 274
- //GO(__NR_mbind, ".m .s");
+ //GO(__NR_mbind, ".s .m");
  //SY(__NR_mbind);
 
    // __NR_get_mempolicy 275
- //GO(__NR_get_mempolicy, ".m .s");
+ //GO(__NR_get_mempolicy, ".s .m");
  //SY(__NR_get_mempolicy);
 
    // __NR_set_mempolicy 276
- //GO(__NR_set_mempolicy, ".m .s");
+ //GO(__NR_set_mempolicy, ".s .m");
  //SY(__NR_set_mempolicy);
 
    // __NR_mq_open  277
- //GO(__NR_mq_open, ".m .s");
+ //GO(__NR_mq_open, ".s .m");
  //SY(__NR_mq_open);
 
    // __NR_mq_unlink (__NR_mq_open+1)
- //GO(__NR_mq_unlink, ".m .s");
+ //GO(__NR_mq_unlink, ".s .m");
  //SY(__NR_mq_unlink);
 
    // __NR_mq_timedsend (__NR_mq_open+2)
- //GO(__NR_mq_timedsend, ".m .s");
+ //GO(__NR_mq_timedsend, ".s .m");
  //SY(__NR_mq_timedsend);
 
    // __NR_mq_timedreceive (__NR_mq_open+3)
- //GO(__NR_mq_timedreceive, ".m .s");
+ //GO(__NR_mq_timedreceive, ".s .m");
  //SY(__NR_mq_timedreceive);
 
    // __NR_mq_notify (__NR_mq_open+4)
- //GO(__NR_mq_notify, ".m .s");
+ //GO(__NR_mq_notify, ".s .m");
  //SY(__NR_mq_notify);
 
    // __NR_mq_getsetattr (__NR_mq_open+5)
- //GO(__NR_mq_getsetattr, ".m .s");
+ //GO(__NR_mq_getsetattr, ".s .m");
  //SY(__NR_mq_getsetattr);
    
    // __NR_sys_kexec_load 283 --> sys_ni_syscall()

diff --git a/memcheck/tests/scalar.stderr.exp b/memcheck/tests/scalar.stderr.exp
index db4aafc0ccda46817749c71748e4de533f5343ec..abccde964219fa89d459fe3faed7c8489d3f48f3 100644 (file)
--- a/memcheck/tests/scalar.stderr.exp
+++ b/memcheck/tests/scalar.stderr.exp
@@ -827,6 +827,25 @@ Syscall param setrlimit(rlim) 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
+-----------------------------------------------------
+ 76:      __NR_getrlimit 2s 1m
+-----------------------------------------------------
+
+Syscall param old_getrlimit(resource) contains uninitialised byte(s)
+   at 0x........: syscall (in /...libc...)
+   by 0x........: __libc_start_main (...libc...)
+   by 0x........: ...
+
+Syscall param old_getrlimit(rlim) contains uninitialised byte(s)
+   at 0x........: syscall (in /...libc...)
+   by 0x........: __libc_start_main (...libc...)
+   by 0x........: ...
+
+Syscall param old_getrlimit(rlim) points to unaddressable byte(s)
+   at 0x........: syscall (in /...libc...)
+   by 0x........: __libc_start_main (...libc...)
+   by 0x........: ...
+ Address 0x........ is not stack'd, malloc'd or (recently) free'd
 -----------------------------------------------------
 111:        __NR_vhangup 0e
 -----------------------------------------------------
@@ -863,6 +882,25 @@ Syscall param uname(buf) points to unaddressable byte(s)
 167:   __NR_query_module 0e
 -----------------------------------------------------
 -----------------------------------------------------
+191:     __NR_ugetrlimit 2s 1m
+-----------------------------------------------------
+
+Syscall param getrlimit(resource) contains uninitialised byte(s)
+   at 0x........: syscall (in /...libc...)
+   by 0x........: __libc_start_main (...libc...)
+   by 0x........: ...
+
+Syscall param getrlimit(rlim) contains uninitialised byte(s)
+   at 0x........: syscall (in /...libc...)
+   by 0x........: __libc_start_main (...libc...)
+   by 0x........: ...
+
+Syscall param getrlimit(rlim) points to unaddressable byte(s)
+   at 0x........: syscall (in /...libc...)
+   by 0x........: __libc_start_main (...libc...)
+   by 0x........: ...
+ Address 0x........ is not stack'd, malloc'd or (recently) free'd
+-----------------------------------------------------
 199:       __NR_getuid32 0e
 -----------------------------------------------------
 -----------------------------------------------------