|
From: <sv...@va...> - 2009-06-10 04:13:07
|
Author: njn
Date: 2009-06-10 05:11:56 +0100 (Wed, 10 Jun 2009)
New Revision: 10290
Log:
Darwin syscall wrapper cleanups:
- Put Darwin syscall DECL_TEMPLATEs in syscall order.
- Removed the "sys_" prefix from Darwin-specific wrappers, it's not
necessary. Renamed a couple of other wrappers similarly.
- Removed the sys_fcntl64 Darwin wrapper, it was unused.
- Improved some code layout.
Overall this removes 6 "DDD"/"GrP" fixme comments.
Modified:
trunk/coregrind/m_syswrap/priv_syswrap-darwin.h
trunk/coregrind/m_syswrap/syswrap-darwin.c
trunk/include/vki/vki-scnums-darwin.h
trunk/memcheck/tests/darwin/scalar.c
trunk/memcheck/tests/darwin/scalar.stderr.exp
Modified: trunk/coregrind/m_syswrap/priv_syswrap-darwin.h
===================================================================
--- trunk/coregrind/m_syswrap/priv_syswrap-darwin.h 2009-06-10 03:30:07 UTC (rev 10289)
+++ trunk/coregrind/m_syswrap/priv_syswrap-darwin.h 2009-06-10 04:11:56 UTC (rev 10290)
@@ -50,109 +50,438 @@
void VG_(show_open_ports)(void);
-// Unix syscalls
-DECL_TEMPLATE(darwin, sys_semget);
-DECL_TEMPLATE(darwin, sys_semop);
-DECL_TEMPLATE(darwin, sys_semctl);
-DECL_TEMPLATE(darwin, sys_sem_open);
-DECL_TEMPLATE(darwin, sys_sem_close);
-DECL_TEMPLATE(darwin, sys_sem_unlink);
-DECL_TEMPLATE(darwin, sys_sem_wait);
-DECL_TEMPLATE(darwin, sys_sem_trywait);
-DECL_TEMPLATE(darwin, sys_sem_post);
-DECL_TEMPLATE(darwin, sys_sem_init);
-DECL_TEMPLATE(darwin, sys_sem_destroy);
-DECL_TEMPLATE(darwin, sys_sem_wait_nocancel);
-DECL_TEMPLATE(darwin, sys_sem_trywait);
-DECL_TEMPLATE(darwin, sys_bsdthread_create);
-DECL_TEMPLATE(darwin, sys_bsdthread_terminate);
-DECL_TEMPLATE(darwin, sys_kqueue);
-DECL_TEMPLATE(darwin, sys_kevent);
-DECL_TEMPLATE(darwin, sys_bsdthread_register);
-DECL_TEMPLATE(darwin, sys_workq_open);
-DECL_TEMPLATE(darwin, sys_workq_ops);
-DECL_TEMPLATE(darwin, sys___mac_syscall);
-DECL_TEMPLATE(darwin, sys_exit);
-DECL_TEMPLATE(darwin, sys_sigaction);
-DECL_TEMPLATE(darwin, sys___pthread_canceled);
-DECL_TEMPLATE(darwin, sys___pthread_markcancel);
-DECL_TEMPLATE(darwin, sys___pthread_sigmask);
-DECL_TEMPLATE(darwin, sys___disable_threadsignal);
-DECL_TEMPLATE(darwin, sys_kdebug_trace);
-DECL_TEMPLATE(darwin, sys_seteuid);
-DECL_TEMPLATE(darwin, sys_setegid);
-DECL_TEMPLATE(darwin, sys_listxattr);
-DECL_TEMPLATE(darwin, sys_flistxattr);
-DECL_TEMPLATE(darwin, sys_shmctl);
-DECL_TEMPLATE(darwin, sys_shmget);
-DECL_TEMPLATE(darwin, sys_shm_open);
-DECL_TEMPLATE(darwin, sys_statx);
-DECL_TEMPLATE(darwin, sys_fchmod_extended);
-DECL_TEMPLATE(darwin, sys_chmod_extended);
-DECL_TEMPLATE(darwin, sys_accessx);
-DECL_TEMPLATE(darwin, sys_chflags);
-DECL_TEMPLATE(darwin, sys_fchflags);
-DECL_TEMPLATE(darwin, sys_stat64);
-DECL_TEMPLATE(darwin, sys_lstat64);
-DECL_TEMPLATE(darwin, sys_fstat64);
-DECL_TEMPLATE(darwin, sys_getfsstat);
-DECL_TEMPLATE(darwin, sys_getattrlist);
-DECL_TEMPLATE(darwin, sys_setattrlist);
-DECL_TEMPLATE(darwin, sys_getdirentriesattr);
-DECL_TEMPLATE(darwin, sys_fsctl);
-DECL_TEMPLATE(darwin, sys_socket);
-DECL_TEMPLATE(darwin, sys_setsockopt);
-DECL_TEMPLATE(darwin, sys_getsockopt);
-DECL_TEMPLATE(darwin, sys_connect);
-DECL_TEMPLATE(darwin, sys_accept);
-DECL_TEMPLATE(darwin, sys_sendto);
-DECL_TEMPLATE(darwin, sys_recvfrom);
-DECL_TEMPLATE(darwin, sys_sendmsg);
-DECL_TEMPLATE(darwin, sys_recvmsg);
-DECL_TEMPLATE(darwin, sys_shutdown);
-DECL_TEMPLATE(darwin, sys_bind);
-DECL_TEMPLATE(darwin, sys_listen);
-DECL_TEMPLATE(darwin, sys_getsockname);
-DECL_TEMPLATE(darwin, sys_getpeername);
-DECL_TEMPLATE(darwin, sys_socketpair);
-DECL_TEMPLATE(darwin, sys_gethostuuid);
-DECL_TEMPLATE(darwin, sys_pipe);
-DECL_TEMPLATE(darwin, sys_getlogin);
-DECL_TEMPLATE(darwin, sys_ptrace);
-DECL_TEMPLATE(darwin, sys_issetugid);
-DECL_TEMPLATE(darwin, sys_getdtablesize);
-DECL_TEMPLATE(darwin, sys_lseek);
-DECL_TEMPLATE(darwin, sys_getdirentries);
-DECL_TEMPLATE(darwin, sys_getdirentries64);
-DECL_TEMPLATE(darwin, sys_statfs64);
-DECL_TEMPLATE(darwin, sys_fstatfs64);
-DECL_TEMPLATE(darwin, sys_csops);
-DECL_TEMPLATE(darwin, sys_auditon);
-DECL_TEMPLATE(darwin, sys_pathconf);
-DECL_TEMPLATE(darwin, sys_fpathconf);
-DECL_TEMPLATE(darwin, sys_shared_region_map_file_np);
-DECL_TEMPLATE(darwin, sys_mmap);
-DECL_TEMPLATE(darwin, sys_sysctl);
-DECL_TEMPLATE(darwin, sys_sigpending);
-DECL_TEMPLATE(darwin, sys_sigprocmask);
-DECL_TEMPLATE(darwin, sys_sigsuspend);
-DECL_TEMPLATE(darwin, sys_watchevent);
-DECL_TEMPLATE(darwin, sys_waitevent);
-DECL_TEMPLATE(darwin, sys_modwatch);
-DECL_TEMPLATE(darwin, sys_getxattr);
-DECL_TEMPLATE(darwin, sys_fgetxattr);
-DECL_TEMPLATE(darwin, sys_setxattr);
-DECL_TEMPLATE(darwin, sys_fsetxattr);
-DECL_TEMPLATE(darwin, sys_initgroups);
-DECL_TEMPLATE(darwin, sys_posix_spawn);
-DECL_TEMPLATE(darwin, sys_settid);
-DECL_TEMPLATE(darwin, sys_sendfile);
-DECL_TEMPLATE(darwin, sys_fcntl);
-DECL_TEMPLATE(darwin, sys_fcntl64);
-DECL_TEMPLATE(darwin, sys_ioctl);
-DECL_TEMPLATE(darwin, sys_futimes);
-DECL_TEMPLATE(darwin, sys_FAKE_SIGRETURN);
-DECL_TEMPLATE(darwin, sys_sigreturn);
+// Unix syscalls.
+// GEN = it uses the generic wrapper
+// NYI = wrapper not yet implemented in Valgrind
+// NOC = the non-"_nocancel" wrapper is used
+// old = the syscall no longer exists in Darwin
+DECL_TEMPLATE(darwin, exit); // 1
+// GEN fork 2
+// GEN read 3
+// GEN write 4
+// GEN open 5
+// GEN close 6
+// GEN wait4 7
+// old creat 8
+// GEN link 9
+// GEN unlink 10
+// old execv 11
+// GEN chdir 12
+// GEN fchdir 13
+// GEN mknod 14
+// GEN chmod 15
+// GEN chown 16
+// old break 17
+DECL_TEMPLATE(darwin, getfsstat); // 18
+// old lseek 19
+// GEN getpid 20
+// old mount 21
+// old umount 22
+// GEN setuid 23
+// GEN getuid 24
+// GEN geteuid 25
+DECL_TEMPLATE(darwin, ptrace); // 26
+DECL_TEMPLATE(darwin, recvmsg); // 27
+DECL_TEMPLATE(darwin, sendmsg); // 28
+DECL_TEMPLATE(darwin, recvfrom); // 29
+DECL_TEMPLATE(darwin, accept); // 30
+DECL_TEMPLATE(darwin, getpeername); // 31
+DECL_TEMPLATE(darwin, getsockname); // 32
+// GEN access 33
+DECL_TEMPLATE(darwin, chflags); // 34
+DECL_TEMPLATE(darwin, fchflags); // 35
+// GEN sync 36
+// GEN kill 37
+// old stat 38
+// GEN getppid 39
+// old lstat 40
+// GEN dup 41
+DECL_TEMPLATE(darwin, pipe); // 42
+// GEN getegid 43
+// NYI profil
+// old ktrace
+DECL_TEMPLATE(darwin, sigaction); // 46
+// GEN getgid 47
+DECL_TEMPLATE(darwin, sigprocmask); // 48
+DECL_TEMPLATE(darwin, getlogin); // 49
+// NYI setlogin 50
+// NYI acct 51
+DECL_TEMPLATE(darwin, sigpending); // 52
+// GEN sigaltstack 53
+DECL_TEMPLATE(darwin, ioctl); // 54
+// NYI reboot 55
+// NYI revoke 56
+// NYI symlink 57
+// GEN readlink 58
+// GEN execve 59
+// GEN umask 60
+// GEN chroot 61
+// old fstat
+// 63 used internally, reserved
+// old getpagesize 64
+// GEN msync 65
+// GEN vfork 66
+// old vread
+// old vwrite
+// old sbrk
+// old sstk
+// old mmap
+// old vadvise
+// GEN munmap 73
+// GEN mprotect 74
+// GEN madvise 75
+// old vhangup
+// old vlimit
+// NYI mincore 78
+// GEN getgroups 79
+// NYI setgroups 80
+// GEN getpgrp 81
+// NYI setpgid 82
+// GEN setitimer 83
+// old wait
+// NYI swapon 85
+// GEN getitimer 86
+// old gethostname
+// old sethostname
+DECL_TEMPLATE(darwin, getdtablesize); // 89
+// GEN dup2 90
+// old getdopt
+DECL_TEMPLATE(darwin, fcntl); // 92
+// GEN select 93
+// old setdopt
+// GEN fsync 95
+// GEN setpriority 96
+DECL_TEMPLATE(darwin, socket); // 97
+DECL_TEMPLATE(darwin, connect); // 98
+// old accept
+// GEN getpriority 100
+// old send
+// old recv
+// old sigreturn
+DECL_TEMPLATE(darwin, bind); // 104
+DECL_TEMPLATE(darwin, setsockopt); // 105
+DECL_TEMPLATE(darwin, listen); // 106
+// old vtimes
+// old sigvec
+// old sigblock
+// old sigsetmask
+DECL_TEMPLATE(darwin, sigsuspend); // 111
+// old sigstack
+// old recvmsg
+// old sendmsg
+// old vtrace
+// GEN gettimeofday 116
+// GEN getrusage 117
+DECL_TEMPLATE(darwin, getsockopt); // 118
+// old resuba
+// GEN readv 120
+// GEN writev 121
+// NYI settimeofday 122
+// GEN fchown 123
+// GEN fchmod 124
+// old recvfrom
+// NYI setreuid 126
+// NYI setregid 127
+// GEN rename 128
+// old truncate
+// old ftruncate
+// GEN flock 131
+// NYI mkfifo 132
+DECL_TEMPLATE(darwin, sendto); // 133
+DECL_TEMPLATE(darwin, shutdown); // 134
+DECL_TEMPLATE(darwin, socketpair); // 135
+// GEN mkdir 136
+// GEN rmdir 137
+// GEN utimes 138
+DECL_TEMPLATE(darwin, futimes); // 139
+// NYI adjtime 140
+// old getpeername
+DECL_TEMPLATE(darwin, gethostuuid); // 142
+// old sethostid
+// old getrlimit
+// old setrlimit
+// old killpg
+// GEN setsid 147
+// old setquota
+// old qquota
+// old getsockname
+// NYI getpgid 151
+// NYI setprivexec 152
+// GEN pread 153
+// GEN pwrite 154
+// NYI nfssvc 155
+// old getdirentries
+// GEN statfs 157
+// GEN fstatfs 158
+// NYI unmount 159
+// old async_daemon
+// NYI getfh 161
+// old getdomainname
+// old setdomainname
+// 164
+// NYI quotactl 165
+// old exportfs
+// NYI mount 167
+// old ustat
+DECL_TEMPLATE(darwin, csops); // 169
+// old table
+// old wait3
+// old rpause
+// NYI waitid 173
+// old getdents
+// old gc_control
+// NYI add_profil 176
+// 177
+// 178
+// 179
+DECL_TEMPLATE(darwin, kdebug_trace); // 180
+// GEN setgid 181
+DECL_TEMPLATE(darwin, setegid); // 182
+DECL_TEMPLATE(darwin, seteuid); // 183
+DECL_TEMPLATE(darwin, sigreturn); // 184
+DECL_TEMPLATE(darwin, FAKE_SIGRETURN);
+// NYI chud 185
+// 186
+// 187
+// GEN stat 188
+// GEN fstat 189
+// GEN lstat 190
+DECL_TEMPLATE(darwin, pathconf); // 191
+DECL_TEMPLATE(darwin, fpathconf); // 192
+// 193
+// GEN getrlimit 194
+// GEN setrlimit 195
+DECL_TEMPLATE(darwin, getdirentries); // 196
+DECL_TEMPLATE(darwin, mmap); // 197
+// 198 __syscall
+DECL_TEMPLATE(darwin, lseek); // 199 (was UX64)
+// GEN truncate 200
+// GEN ftruncate 201
+DECL_TEMPLATE(darwin, __sysctl); // 202
+// GEN mlock 203
+// GEN munlock 204
+// NYI undelete 205
+// NYI ATsocket 206
+// NYI ATgetmsg 207
+// NYI ATputmsg 208
+// NYI ATPsndreq 209
+// NYI ATPsndrsp 210
+// NYI ATPgetreq 211
+// NYI ATPgetrsp 212
+// 213 Reserved for AppleTalk
+// NYI kqueue_from_portset_np 214
+// NYI kqueue_portset_np 215
+// NYI mkcomplex 216
+// NYI statv 217
+// NYI lstatv 218
+// NYI fstatv 219
+DECL_TEMPLATE(darwin, getattrlist); // 220
+DECL_TEMPLATE(darwin, setattrlist); // 221
+DECL_TEMPLATE(darwin, getdirentriesattr); // 222
+// NYI exchangedata 223
+// 224 checkuseraccess
+// NYI searchfs 225
+// GEN delete 226
+// NYI copyfile 226
+// 228
+// 229
+// GEN poll 230
+DECL_TEMPLATE(darwin, watchevent); // 231
+DECL_TEMPLATE(darwin, waitevent); // 232
+DECL_TEMPLATE(darwin, modwatch); // 233
+DECL_TEMPLATE(darwin, getxattr); // 234
+DECL_TEMPLATE(darwin, fgetxattr); // 235
+DECL_TEMPLATE(darwin, setxattr); // 236
+DECL_TEMPLATE(darwin, fsetxattr); // 237
+// NYI removexattr 238
+// NYI fremovexattr 239
+DECL_TEMPLATE(darwin, listxattr); // 240
+DECL_TEMPLATE(darwin, flistxattr); // 241
+DECL_TEMPLATE(darwin, fsctl); // 242
+DECL_TEMPLATE(darwin, initgroups); // 243
+DECL_TEMPLATE(darwin, posix_spawn); // 244
+// 245
+// 246
+// NYI nfsclnt 247
+// NYI fhopen 248
+// 249
+// NYI minherit 250
+// NYI semsys 251
+// NYI msgsys 252
+// NYI shmsys 253
+DECL_TEMPLATE(darwin, semctl); // 254
+DECL_TEMPLATE(darwin, semget); // 255
+DECL_TEMPLATE(darwin, semop); // 256
+// 257
+// NYI msgctl 258
+// NYI msgget 259
+// NYI msgsnd 260
+// NYI msgrcv 261
+// NYI shmat 262
+DECL_TEMPLATE(darwin, shmctl); // 263
+// NYI shmdt 264
+DECL_TEMPLATE(darwin, shmget); // 265
+DECL_TEMPLATE(darwin, shm_open); // 266
+// NYI shm_unlink 267
+DECL_TEMPLATE(darwin, sem_open); // 268
+DECL_TEMPLATE(darwin, sem_close); // 269
+DECL_TEMPLATE(darwin, sem_unlink); // 270
+DECL_TEMPLATE(darwin, sem_wait); // 271
+DECL_TEMPLATE(darwin, sem_trywait); // 272
+DECL_TEMPLATE(darwin, sem_post); // 273
+// NYI sem_getvalue 274
+DECL_TEMPLATE(darwin, sem_init); // 275
+DECL_TEMPLATE(darwin, sem_destroy); // 276
+// NYI open_extended 277
+// NYI umask_extended 278
+DECL_TEMPLATE(darwin, stat_extended); // 279
+// NYI lstat_extended 280
+// NYI fstat_extended 281
+DECL_TEMPLATE(darwin, chmod_extended); // 282
+DECL_TEMPLATE(darwin, fchmod_extended); // 283
+// NYI access_extended 284
+DECL_TEMPLATE(darwin, settid); // 285
+// NYI gettid 286
+// NYI setsgroups 287
+// NYI getsgroups 288
+// NYI setwgroups 289
+// NYI getwgroups 290
+// NYI mkfifo_extended 291
+// NYI mkdir_extended 292
+// NYI identitysvc 293
+// NYI shared_region_check_np 294
+// NYI shared_region_map_np 295
+// old load_shared_file
+// old reset_shared_file
+// old new_system_shared_regions
+// old shared_region_map_file_np
+// old shared_region_make_private_np
+// NYI __pthread_mutex_destroy 301
+// NYI __pthread_mutex_init 302
+// NYI __pthread_mutex_lock 303
+// NYI __pthread_mutex_trylock 304
+// NYI __pthread_mutex_unlock 305
+// NYI __pthread_cond_init 306
+// NYI __pthread_cond_destroy 307
+// NYI __pthread_cond_broadcast 308
+// NYI __pthread_cond_signal 309
+// NYI getsid 310
+// NYI settid_with_pid 311
+// NYI __pthread_cond_timedwait 312
+// NYI aio_fsync 313
+// NYI aio_return 314
+// NYI aio_suspend 315
+// NYI aio_cancel 316
+// NYI aio_error 317
+// NYI aio_read 318
+// NYI aio_write 319
+// NYI lio_listio 320
+// NYI __pthread_cond_wait 321
+// NYI iopolicysys 322
+// 323
+// NYI mlockall 324
+// NYI munlockall 325
+// 326
+DECL_TEMPLATE(darwin, issetugid); // 327
+// NYI __pthread_kill 328
+DECL_TEMPLATE(darwin, __pthread_sigmask); // 329
+// NYI __sigwait 330
+DECL_TEMPLATE(darwin, __disable_threadsignal); // 331
+DECL_TEMPLATE(darwin, __pthread_markcancel); // 332
+DECL_TEMPLATE(darwin, __pthread_canceled); // 333
+DECL_TEMPLATE(darwin, __semwait_signal); // 334
+// old utrace
+// NYI proc_info 336
+DECL_TEMPLATE(darwin, sendfile); // 337
+DECL_TEMPLATE(darwin, stat64); // 338
+DECL_TEMPLATE(darwin, fstat64); // 339
+DECL_TEMPLATE(darwin, lstat64); // 340
+// NYI stat64_extended 341
+// NYI lstat64_extended 342
+// NYI fstat64_extended 343
+DECL_TEMPLATE(darwin, getdirentries64); // 344
+DECL_TEMPLATE(darwin, statfs64); // 345
+DECL_TEMPLATE(darwin, fstatfs64); // 346
+// NYI getfsstat64 347
+// NYI __pthread_chdir 348
+// NYI __pthread_fchdir 349
+// NYI audit 350
+DECL_TEMPLATE(darwin, auditon); // 351
+// 352
+// NYI getauid 353
+// NYI setauid 354
+// NYI getaudit 355
+// NYI setaudit 356
+// NYI getaudit_addr 357
+// NYI setaudit_addr 358
+// NYI auditctl 359
+DECL_TEMPLATE(darwin, bsdthread_create); // 360
+DECL_TEMPLATE(darwin, bsdthread_terminate); // 361
+DECL_TEMPLATE(darwin, kqueue); // 362
+DECL_TEMPLATE(darwin, kevent); // 363
+// NYI lchown 364
+// NYI stack_snapshot 365
+DECL_TEMPLATE(darwin, bsdthread_register); // 366
+DECL_TEMPLATE(darwin, workq_open); // 367
+DECL_TEMPLATE(darwin, workq_ops); // 368
+// 369
+// 370
+// 371
+// 372
+// 373
+// 374
+// 375
+// 376
+// 377
+// 378
+// 379
+// NYI __mac_execve 380
+DECL_TEMPLATE(darwin, __mac_syscall); // 381
+// NYI __mac_get_file 382
+// NYI __mac_set_file 383
+// NYI __mac_get_link 384
+// NYI __mac_set_link 385
+// NYI __mac_get_proc 386
+// NYI __mac_set_proc 387
+// NYI __mac_get_fd 388
+// NYI __mac_set_fd 389
+// NYI __mac_get_pid 390
+// NYI __mac_get_lcid 391
+// NYI __mac_get_lctx 392
+// NYI __mac_set_lctx 393
+// NYI setlcid 394
+// NYI getlcid 395
+// GEN read_nocancel 396
+// GEN write_nocancel 397
+// GEN open_nocancel 398
+// GEN close_nocancel 399
+// GEN wait4_nocancel 400
+// NOC recvmsg_nocancel 401
+// NOC sendmsg_nocancel 402
+// NOC recvfrom_nocancel 403
+// NOC accept_nocancel 404
+// GEN msync_nocancel 405
+// NOC fcntl_nocancel 406
+// GEN select_nocancel 407
+// GEN fsync_nocancel 408
+// NOC connect_nocancel 409
+// NYI sigsuspend_nocancel 410
+// GEN readv_nocancel 411
+// GEN writev_nocancel 412
+// NOC sendto_nocancel 413
+// GEN pread_nocancel 414
+// GEN pwrite_nocancel 415
+// NYI waitid_nocancel 416
+// GEN poll_nocancel 417
+// NYI msgsnd_nocancel 418
+// NYI msgrcv_nocancel 419
+// NOC sem_wait_nocancel 420
+// NYI aio_suspend_nocancel 421
+// NYI __sigwait_nocancel 422
+// NOC __semwait_signal_nocancel 423
+// NYI __mac_mount 424
+// NYI __mac_get_mount 425
+// NYI __mac_getfsstat 426
// Mach message helpers
DECL_TEMPLATE(darwin, host_info);
@@ -230,7 +559,6 @@
DECL_TEMPLATE(darwin, semaphore_wait_signal);
DECL_TEMPLATE(darwin, semaphore_timedwait);
DECL_TEMPLATE(darwin, semaphore_timedwait_signal);
-DECL_TEMPLATE(darwin, sys___semwait_signal);
DECL_TEMPLATE(darwin, task_for_pid);
DECL_TEMPLATE(darwin, pid_for_task);
DECL_TEMPLATE(darwin, mach_timebase_info);
Modified: trunk/coregrind/m_syswrap/syswrap-darwin.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-darwin.c 2009-06-10 03:30:07 UTC (rev 10289)
+++ trunk/coregrind/m_syswrap/syswrap-darwin.c 2009-06-10 04:11:56 UTC (rev 10290)
@@ -667,10 +667,10 @@
darwin ioctl wrapper
------------------------------------------------------------------ */
-PRE(sys_ioctl)
+PRE(ioctl)
{
*flags |= SfMayBlock;
- PRINT("sys_ioctl ( %ld, 0x%lx, %#lx )",ARG1,ARG2,ARG3);
+ PRINT("ioctl ( %ld, 0x%lx, %#lx )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "ioctl",
unsigned int, fd, unsigned int, request, unsigned long, arg);
@@ -857,7 +857,7 @@
}
-POST(sys_ioctl)
+POST(ioctl)
{
vg_assert(SUCCESS);
switch (ARG2 /* request */) {
@@ -1008,14 +1008,14 @@
#undef F
}
-PRE(sys_fcntl)
+PRE(fcntl)
{
switch (ARG2) {
// These ones ignore ARG3.
case VKI_F_GETFD:
case VKI_F_GETFL:
case VKI_F_GETOWN:
- PRINT("sys_fcntl ( %ld, %ld )", ARG1,ARG2);
+ PRINT("fcntl ( %ld, %ld )", ARG1,ARG2);
PRE_REG_READ2(long, "fcntl", unsigned int, fd, unsigned int, cmd);
break;
@@ -1024,7 +1024,7 @@
case VKI_F_SETFD:
case VKI_F_SETFL:
case VKI_F_SETOWN:
- PRINT("sys_fcntl[ARG3=='arg'] ( %ld, %ld, %ld )", ARG1,ARG2,ARG3);
+ PRINT("fcntl[ARG3=='arg'] ( %ld, %ld, %ld )", ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd, unsigned long, arg);
break;
@@ -1033,7 +1033,7 @@
case VKI_F_GETLK:
case VKI_F_SETLK:
case VKI_F_SETLKW:
- PRINT("sys_fcntl[ARG3=='lock'] ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3);
+ PRINT("fcntl[ARG3=='lock'] ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd,
struct flock64 *, lock);
@@ -1050,13 +1050,13 @@
case VKI_F_FREEZE_FS:
case VKI_F_THAW_FS:
case VKI_F_GLOBAL_NOCACHE:
- PRINT("sys_fcntl ( %ld, %s )", ARG1, name_for_fcntl(ARG1));
+ PRINT("fcntl ( %ld, %s )", ARG1, name_for_fcntl(ARG1));
PRE_REG_READ2(long, "fcntl", unsigned int, fd, unsigned int, cmd);
break;
// struct fstore
case VKI_F_PREALLOCATE:
- PRINT("sys_fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
+ PRINT("fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd,
struct fstore *, fstore);
@@ -1077,7 +1077,7 @@
// off_t
case VKI_F_SETSIZE:
- PRINT("sys_fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
+ PRINT("fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd,
vki_off_t *, offset);
@@ -1085,7 +1085,7 @@
// struct radvisory
case VKI_F_RDADVISE:
- PRINT("sys_fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
+ PRINT("fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd,
struct vki_radvisory *, radvisory);
@@ -1101,7 +1101,7 @@
// struct fbootstraptransfer
case VKI_F_READBOOTSTRAP:
case VKI_F_WRITEBOOTSTRAP:
- PRINT("sys_fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
+ PRINT("fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd,
struct fbootstraptransfer *, bootstrap);
@@ -1111,7 +1111,7 @@
// struct log2phys (out)
case VKI_F_LOG2PHYS:
- PRINT("sys_fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
+ PRINT("fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd,
struct log2phys *, l2p);
@@ -1121,7 +1121,7 @@
// char[maxpathlen] (out)
case VKI_F_GETPATH:
- PRINT("sys_fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
+ PRINT("fcntl ( %ld, %s, %#lx )", ARG1, name_for_fcntl(ARG2), ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd,
char *, pathbuf);
@@ -1131,7 +1131,7 @@
// char[maxpathlen] (in)
case VKI_F_PATHPKG_CHECK:
- PRINT("sys_fcntl ( %ld, %s, %#lx '%s')", ARG1, name_for_fcntl(ARG2), ARG3,
+ PRINT("fcntl ( %ld, %s, %#lx '%s')", ARG1, name_for_fcntl(ARG2), ARG3,
(char *)ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd,
@@ -1140,7 +1140,7 @@
break;
case VKI_F_ADDSIGS: /* Add detached signatures (for code signing) */
- PRINT("sys_fcntl ( %ld, %s )", ARG1, name_for_fcntl(ARG2));
+ PRINT("fcntl ( %ld, %s )", ARG1, name_for_fcntl(ARG2));
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd,
vki_fsignatures_t *, sigs);
@@ -1159,13 +1159,13 @@
break;
default:
- PRINT("sys_fcntl ( %ld, %ld [??] )", ARG1, ARG2);
+ PRINT("fcntl ( %ld, %ld [??] )", ARG1, ARG2);
VG_(printf)("UNKNOWN fcntl %ld!", ARG2);
break;
}
}
-POST(sys_fcntl)
+POST(fcntl)
{
vg_assert(SUCCESS);
switch (ARG2) {
@@ -1212,84 +1212,13 @@
}
}
-// XXX: wrapper only suitable for 32-bit systems
-PRE(sys_fcntl64)
-{
- switch (ARG2) {
- // These ones ignore ARG3.
- case VKI_F_GETFD:
- case VKI_F_GETFL:
- case VKI_F_GETOWN:
- PRINT("sys_fcntl64 ( %ld, %ld )", ARG1,ARG2);
- PRE_REG_READ2(long, "fcntl64", unsigned int, fd, unsigned int, cmd);
- break;
-
- // These ones use ARG3 as "arg".
- case VKI_F_DUPFD:
- case VKI_F_SETFD:
- case VKI_F_SETFL:
- case VKI_F_SETOWN:
- PRINT("sys_fcntl64[ARG3=='arg'] ( %ld, %ld, %ld )", ARG1,ARG2,ARG3);
- PRE_REG_READ3(long, "fcntl64",
- unsigned int, fd, unsigned int, cmd, unsigned long, arg);
- break;
-
- // These ones use ARG3 as "lock".
- case VKI_F_GETLK:
- case VKI_F_SETLK:
- case VKI_F_SETLKW:
- PRINT("sys_fcntl64[ARG3=='lock'] ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3);
- PRE_REG_READ3(long, "fcntl64",
- unsigned int, fd, unsigned int, cmd,
- struct flock64 *, lock);
- if (ARG2 == VKI_F_SETLKW)
- *flags |= SfMayBlock;
- break;
-
- default:
- I_die_here; // DDD: do something better here
- break;
- }
-}
-
-POST(sys_fcntl64)
-{
- vg_assert(SUCCESS);
- switch (ARG2) {
- case VKI_F_DUPFD:
- if (!ML_(fd_allowed)(RES, "fcntl64(DUPFD)", tid, True)) {
- VG_(close)(RES);
- SET_STATUS_Failure( VKI_EMFILE );
- } else {
- if (VG_(clo_track_fds))
- ML_(record_fd_open_named)(tid, RES);
- }
- break;
-
- case VKI_F_GETFD:
- case VKI_F_GETFL:
- case VKI_F_GETOWN:
- case VKI_F_SETFD:
- case VKI_F_SETFL:
- case VKI_F_SETOWN:
- case VKI_F_GETLK:
- case VKI_F_SETLK:
- case VKI_F_SETLKW:
- break;
-
- default:
- I_die_here; // DDD: do something better here
- break;
- }
-}
-
/* ---------------------------------------------------------------------
unix syscalls
------------------------------------------------------------------ */
-PRE(sys_futimes)
+PRE(futimes)
{
- PRINT("sys_futimes ( %ld, %#lx )", ARG1,ARG2);
+ PRINT("futimes ( %ld, %#lx )", ARG1,ARG2);
PRE_REG_READ2(long, "futimes", int, fd, struct timeval *, tvp);
if (ARG2 != 0) {
PRE_timeval_READ( "futimes(tvp[0])", ARG2 );
@@ -1297,66 +1226,66 @@
}
}
-PRE(sys_semget)
+PRE(semget)
{
- PRINT("sys_semget ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
+ PRINT("semget ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "semget", vki_key_t, key, int, nsems, int, semflg);
}
-PRE(sys_semop)
+PRE(semop)
{
*flags |= SfMayBlock;
- PRINT("sys_semop ( %ld, %#lx, %lu )",ARG1,ARG2,ARG3);
+ PRINT("semop ( %ld, %#lx, %lu )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "semop",
int, semid, struct sembuf *, sops, vki_size_t, nsoops);
ML_(generic_PRE_sys_semop)(tid, ARG1,ARG2,ARG3);
}
-PRE(sys_semctl)
+PRE(semctl)
{
switch (ARG3) {
case VKI_IPC_STAT:
case VKI_IPC_SET:
- PRINT("sys_semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
+ PRINT("semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "semctl",
int, semid, int, semnum, int, cmd, struct semid_ds *, arg);
break;
case VKI_GETALL:
case VKI_SETALL:
- PRINT("sys_semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
+ PRINT("semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "semctl",
int, semid, int, semnum, int, cmd, unsigned short *, arg);
break;
case VKI_SETVAL:
- PRINT("sys_semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
+ PRINT("semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "semctl",
int, semid, int, semnum, int, cmd, int, arg);
break;
default:
- PRINT("sys_semctl ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
+ PRINT("semctl ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "semctl",
int, semid, int, semnum, int, cmd);
break;
}
ML_(generic_PRE_sys_semctl)(tid, ARG1,ARG2,ARG3,ARG4);
}
-POST(sys_semctl)
+POST(semctl)
{
ML_(generic_POST_sys_semctl)(tid, RES,ARG1,ARG2,ARG3,ARG4);
}
-PRE(sys_sem_open)
+PRE(sem_open)
{
if (ARG2 & VKI_O_CREAT) {
// 4-arg version
- PRINT("sys_sem_open ( %#lx(%s), %ld, %ld, %ld )",
+ PRINT("sem_open ( %#lx(%s), %ld, %ld, %ld )",
ARG1,(char*)ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(vki_sem_t *, "sem_open",
const char *, name, int, oflag, vki_mode_t, mode,
unsigned int, value);
} else {
// 2-arg version
- PRINT("sys_sem_open ( %#lx(%s), %ld )",ARG1,(char*)ARG1,ARG2);
+ PRINT("sem_open ( %#lx(%s), %ld )",ARG1,(char*)ARG1,ARG2);
PRE_REG_READ2(vki_sem_t *, "sem_open",
const char *, name, int, oflag);
}
@@ -1366,34 +1295,34 @@
*flags |= SfMayBlock;
}
-PRE(sys_sem_close)
+PRE(sem_close)
{
PRINT("sem_close( %#lx )", ARG1);
PRE_REG_READ1(int, "sem_close", vki_sem_t *, sem);
}
-PRE(sys_sem_unlink)
+PRE(sem_unlink)
{
PRINT("sem_unlink( %#lx(%s) )", ARG1,(char*)ARG1);
PRE_REG_READ1(int, "sem_unlink", const char *, name);
PRE_MEM_RASCIIZ( "sem_unlink(name)", ARG1 );
}
-PRE(sys_sem_post)
+PRE(sem_post)
{
PRINT("sem_post( %#lx )", ARG1);
PRE_REG_READ1(int, "sem_post", vki_sem_t *, sem);
*flags |= SfMayBlock;
}
-PRE(sys_sem_destroy)
+PRE(sem_destroy)
{
PRINT("sem_destroy( %#lx )", ARG1);
PRE_REG_READ1(int, "sem_destroy", vki_sem_t *, sem);
PRE_MEM_READ("sem_destroy(sem)", ARG1, sizeof(vki_sem_t));
}
-PRE(sys_sem_init)
+PRE(sem_init)
{
PRINT("sem_init( %#lx, %ld, %ld )", ARG1, ARG2, ARG3);
PRE_REG_READ3(int, "sem_init", vki_sem_t *, sem,
@@ -1401,38 +1330,31 @@
PRE_MEM_WRITE("sem_init(sem)", ARG1, sizeof(vki_sem_t));
}
-POST(sys_sem_init)
+POST(sem_init)
{
POST_MEM_WRITE(ARG1, sizeof(vki_sem_t));
}
-PRE(sys_sem_wait)
+PRE(sem_wait)
{
PRINT("sem_wait( %#lx )", ARG1);
PRE_REG_READ1(int, "sem_wait", vki_sem_t *, sem);
*flags |= SfMayBlock;
}
-PRE(sys_sem_wait_nocancel)
+PRE(sem_trywait)
{
- PRINT("sem_wait_nocancel( %#lx )", ARG1);
- PRE_REG_READ1(int, "sem_wait_nocancel", vki_sem_t *, sem);
- *flags |= SfMayBlock;
-}
-
-PRE(sys_sem_trywait)
-{
PRINT("sem_trywait( %#lx )", ARG1);
PRE_REG_READ1(int, "sem_trywait", vki_sem_t *, sem);
*flags |= SfMayBlock;
}
-PRE(sys_kqueue)
+PRE(kqueue)
{
PRINT("kqueue()");
}
-POST(sys_kqueue)
+POST(kqueue)
{
if (!ML_(fd_allowed)(RES, "kqueue", tid, True)) {
VG_(close)(RES);
@@ -1444,7 +1366,7 @@
}
}
-PRE(sys_kevent)
+PRE(kevent)
{
PRINT("kevent( %ld, %#lx, %ld, %#lx, %ld, %#lx )",
ARG1, ARG2, ARG3, ARG4, ARG5, ARG6);
@@ -1463,7 +1385,7 @@
*flags |= SfMayBlock;
}
-POST(sys_kevent)
+POST(kevent)
{
PRINT("kevent ret %ld dst %#lx (%zu)", RES, ARG4, sizeof(struct vki_kevent));
if (RES > 0) POST_MEM_WRITE(ARG4, RES * sizeof(struct vki_kevent));
@@ -1474,7 +1396,7 @@
Addr wqthread_starter = 0;
SizeT pthread_structsize = 0;
-PRE(sys_bsdthread_register)
+PRE(bsdthread_register)
{
PRINT("bsdthread_register( %#lx, %#lx, %lu )", ARG1, ARG2, ARG3);
PRE_REG_READ3(int,"__bsdthread_register", void *,"threadstart",
@@ -1487,7 +1409,7 @@
ARG2 = (Word)&wqthread_hijack_asm;
}
-PRE(sys_workq_open)
+PRE(workq_open)
{
PRINT("workq_open()");
PRE_REG_READ0(int, "workq_open");
@@ -1507,7 +1429,7 @@
}
-PRE(sys_workq_ops)
+PRE(workq_ops)
{
PRINT("workq_ops( %ld(%s), %#lx, %ld )", ARG1, workqop_name(ARG1), ARG2,
ARG3);
@@ -1543,8 +1465,7 @@
break;
}
}
-
-POST(sys_workq_ops)
+POST(workq_ops)
{
ThreadState *tst = VG_(get_ThreadState)(tid);
tst->os_state.wq_jmpbuf_valid = False;
@@ -1552,7 +1473,7 @@
-PRE(sys___mac_syscall)
+PRE(__mac_syscall)
{
PRINT("__mac_syscall( %#lx, %ld, %#lx )", ARG1, ARG2, ARG3);
PRE_REG_READ3(int,"__mac_syscall", char *,"policy",
@@ -1563,9 +1484,9 @@
}
-/* Not syswrap-generic's sys_exit, which exits only one thread.
+/* Not like syswrap-generic's sys_exit, which exits only one thread.
More like syswrap-generic's sys_exit_group. */
-PRE(sys_exit)
+PRE(exit)
{
ThreadId t;
ThreadState* tst;
@@ -1596,9 +1517,9 @@
}
-PRE(sys_sigaction)
+PRE(sigaction)
{
- PRINT("sys_sigaction ( %ld, %#lx, %#lx )", ARG1,ARG2,ARG3);
+ PRINT("sigaction ( %ld, %#lx, %#lx )", ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "sigaction",
int, signum, vki_sigaction_toK_t *, act,
vki_sigaction_fromK_t *, oldact);
@@ -1621,7 +1542,7 @@
(vki_sigaction_fromK_t *)ARG3)
);
}
-POST(sys_sigaction)
+POST(sigaction)
{
vg_assert(SUCCESS);
if (RES == 0 && ARG3 != 0)
@@ -1629,7 +1550,7 @@
}
-PRE(sys___pthread_sigmask)
+PRE(__pthread_sigmask)
{
// GrP fixme
// JRS: arguments are identical to sigprocmask
@@ -1644,7 +1565,7 @@
}
-PRE(sys___pthread_canceled)
+PRE(__pthread_canceled)
{
*flags |= SfMayBlock; /* might kill this thread??? */
/* I don't think so -- I think it just changes the cancellation
@@ -1654,7 +1575,7 @@
}
-PRE(sys___pthread_markcancel)
+PRE(__pthread_markcancel)
{
*flags |= SfMayBlock; /* might kill this thread??? */
PRINT("__pthread_markcancel ( %#lx )", ARG1);
@@ -1663,7 +1584,7 @@
}
-PRE(sys___disable_threadsignal)
+PRE(__disable_threadsignal)
{
vki_sigset_t set;
PRINT("__disable_threadsignal(%ld, %ld, %ld)", ARG1, ARG2, ARG3);
@@ -1683,7 +1604,7 @@
}
-PRE(sys_kdebug_trace)
+PRE(kdebug_trace)
{
PRINT("kdebug_trace(%ld, %ld, %ld, %ld, %ld, %ld)",
ARG1, ARG2, ARG3, ARG4, ARG5, ARG6);
@@ -1694,20 +1615,20 @@
}
-PRE(sys_seteuid)
+PRE(seteuid)
{
PRINT("seteuid(%ld)", ARG1);
PRE_REG_READ1(long, "seteuid", vki_uid_t, "uid");
}
-PRE(sys_setegid)
+PRE(setegid)
{
PRINT("setegid(%ld)", ARG1);
PRE_REG_READ1(long, "setegid", vki_uid_t, "uid");
}
-PRE(sys_settid)
+PRE(settid)
{
PRINT("settid(%ld, %ld)", ARG1, ARG2);
PRE_REG_READ2(long, "settid", vki_uid_t, "uid", vki_gid_t, "gid");
@@ -1716,7 +1637,7 @@
/* XXX need to check whether we need POST operations for
* waitevent, watchevent, modwatch -- jpeach
*/
-PRE(sys_watchevent)
+PRE(watchevent)
{
PRINT("watchevent(%#lx, %#lx)", ARG1, ARG2);
PRE_REG_READ2(long, "watchevent",
@@ -1728,7 +1649,7 @@
}
#define WAITEVENT_FAST_POLL ((Addr)(struct timeval *)-1)
-PRE(sys_waitevent)
+PRE(waitevent)
{
PRINT("waitevent(%#lx, %#lx)", ARG1, ARG2);
PRE_REG_READ2(long, "waitevent",
@@ -1743,12 +1664,12 @@
*flags |= SfMayBlock;
}
-POST(sys_waitevent)
+POST(waitevent)
{
POST_MEM_WRITE(ARG1, sizeof(vki_eventreq));
}
-PRE(sys_modwatch)
+PRE(modwatch)
{
PRINT("modwatch(%#lx, %#lx)", ARG1, ARG2);
PRE_REG_READ2(long, "modwatch",
@@ -1758,7 +1679,7 @@
PRE_MEM_READ("modwatch(eventmask)", ARG2, sizeof(unsigned int));
}
-PRE(sys_getxattr)
+PRE(getxattr)
{
PRINT("getxattr(%#lx(%s), %#lx(%s), %#lx, %lu, %lu, %ld)",
ARG1, (char *)ARG1, ARG2, (char *)ARG2, ARG3, ARG4, ARG5, ARG6);
@@ -1771,13 +1692,13 @@
PRE_MEM_WRITE( "getxattr(value)", ARG3, ARG4);
}
-POST(sys_getxattr)
+POST(getxattr)
{
vg_assert((vki_ssize_t)RES >= 0);
POST_MEM_WRITE(ARG3, (vki_ssize_t)RES);
}
-PRE(sys_fgetxattr)
+PRE(fgetxattr)
{
PRINT("fgetxattr(%ld, %#lx(%s), %#lx, %lu, %lu, %ld)",
ARG1, ARG2, (char *)ARG2, ARG3, ARG4, ARG5, ARG6);
@@ -1789,13 +1710,13 @@
PRE_MEM_WRITE( "getxattr(value)", ARG3, ARG4);
}
-POST(sys_fgetxattr)
+POST(fgetxattr)
{
vg_assert((vki_ssize_t)RES >= 0);
POST_MEM_WRITE(ARG3, (vki_ssize_t)RES);
}
-PRE(sys_setxattr)
+PRE(setxattr)
{
PRINT("setxattr ( %#lx(%s), %#lx(%s), %#lx, %lu, %lu, %ld )",
ARG1, (char *)ARG1, ARG2, (char*)ARG2, ARG3, ARG4, ARG5, ARG6 );
@@ -1809,7 +1730,7 @@
}
-PRE(sys_fsetxattr)
+PRE(fsetxattr)
{
PRINT( "fsetxattr ( %ld, %#lx(%s), %#lx, %lu, %lu, %ld )",
ARG1, ARG2, (char*)ARG2, ARG3, ARG4, ARG5, ARG6 );
@@ -1822,7 +1743,7 @@
}
-PRE(sys_listxattr)
+PRE(listxattr)
{
PRINT( "listxattr ( %#lx(%s), %#lx, %lu, %ld )",
ARG1, (char *)ARG1, ARG2, ARG3, ARG4 );
@@ -1834,7 +1755,7 @@
PRE_MEM_WRITE( "listxattr(namebuf)", ARG2, ARG3 );
*flags |= SfMayBlock;
}
-POST(sys_listxattr)
+POST(listxattr)
{
vg_assert(SUCCESS);
vg_assert((vki_ssize_t)RES >= 0);
@@ -1842,7 +1763,7 @@
}
-PRE(sys_flistxattr)
+PRE(flistxattr)
{
PRINT( "flistxattr ( %ld, %#lx, %lu, %ld )",
ARG1, ARG2, ARG3, ARG4 );
@@ -1852,33 +1773,32 @@
PRE_MEM_WRITE( "flistxattr(namebuf)", ARG2, ARG3 );
*flags |= SfMayBlock;
}
-POST(sys_flistxattr)
+POST(flistxattr)
{
vg_assert(SUCCESS);
vg_assert((vki_ssize_t)RES >= 0);
POST_MEM_WRITE( ARG2, (vki_ssize_t)RES );
}
-PRE(sys_shmget)
+PRE(shmget)
{
- PRINT("sys_shmget ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
+ PRINT("shmget ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "shmget", vki_key_t, key, vki_size_t, size, int, shmflg);
}
-PRE(sys_shmctl)
+PRE(shmctl)
{
- PRINT("sys_shmctl ( %ld, %ld, %#lx )",ARG1,ARG2,ARG3);
+ PRINT("shmctl ( %ld, %ld, %#lx )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "shmctl",
int, shmid, int, cmd, struct vki_shmid_ds *, buf);
ML_(generic_PRE_sys_shmctl)(tid, ARG1,ARG2,ARG3);
}
-
-POST(sys_shmctl)
+POST(shmctl)
{
ML_(generic_POST_sys_shmctl)(tid, RES,ARG1,ARG2,ARG3);
}
-PRE(sys_shm_open)
+PRE(shm_open)
{
PRINT("shm_open(%#lx(%s), %ld, %ld)", ARG1, (char *)ARG1, ARG2, ARG3);
PRE_REG_READ3(long, "shm_open",
@@ -1888,8 +1808,7 @@
*flags |= SfMayBlock;
}
-
-POST(sys_shm_open)
+POST(shm_open)
{
vg_assert(SUCCESS);
if (!ML_(fd_allowed)(RES, "shm_open", tid, True)) {
@@ -1902,19 +1821,19 @@
}
-PRE(sys_statx)
+PRE(stat_extended)
{
- PRINT("statx( %#lx(%s), %#lx, %#lx, %#lx )",
+ PRINT("stat_extended( %#lx(%s), %#lx, %#lx, %#lx )",
ARG1, (char *)ARG1, ARG2, ARG3, ARG4);
- PRE_REG_READ4(int, "statx", char *, file_name, struct stat *, buf,
+ PRE_REG_READ4(int, "stat_extended", char *, file_name, struct stat *, buf,
void *, fsacl, vki_size_t *, fsacl_size);
- PRE_MEM_RASCIIZ( "statx(file_name)", ARG1 );
- PRE_MEM_READ( "statx(fsacl_size)", ARG4, sizeof(vki_size_t) );
- PRE_MEM_WRITE( "statx(buf)", ARG2, sizeof(struct vki_stat) );
- PRE_MEM_WRITE( "statx(fsacl_size)", ARG4, sizeof(vki_size_t) );
- PRE_MEM_WRITE( "statx(fsacl)", ARG3, *(vki_size_t *)ARG4 );
+ PRE_MEM_RASCIIZ( "stat_extended(file_name)", ARG1 );
+ PRE_MEM_READ( "stat_extended(fsacl_size)", ARG4, sizeof(vki_size_t) );
+ PRE_MEM_WRITE( "stat_extended(buf)", ARG2, sizeof(struct vki_stat) );
+ PRE_MEM_WRITE( "stat_extended(fsacl_size)", ARG4, sizeof(vki_size_t) );
+ PRE_MEM_WRITE( "stat_extended(fsacl)", ARG3, *(vki_size_t *)ARG4 );
}
-POST(sys_statx)
+POST(stat_extended)
{
POST_MEM_WRITE( ARG2, sizeof(struct vki_stat) );
POST_MEM_WRITE( ARG4, sizeof(vki_size_t) );
@@ -1922,11 +1841,11 @@
}
-PRE(sys_fchmod_extended)
+PRE(fchmod_extended)
{
/* Note: this is not really correct. Handling of
- sys_chmod_extended is broken in the same way. */
- PRINT("sys_fchmod_extended ( %ld, %ld, %ld, %ld, %#lx )",
+ chmod_extended is broken in the same way. */
+ PRINT("fchmod_extended ( %ld, %ld, %ld, %ld, %#lx )",
ARG1, ARG2, ARG3, ARG4, ARG5);
PRE_REG_READ5(long, "fchmod",
unsigned int, fildes,
@@ -1940,11 +1859,11 @@
sizeof(struct kauth_filesec) );
}
-PRE(sys_chmod_extended)
+PRE(chmod_extended)
{
/* Note: this is not really correct. Handling of
- sys_fchmod_extended is broken in the same way. */
- PRINT("sys_chmod_extended ( %#lx(%s), %ld, %ld, %ld, %#lx )",
+ fchmod_extended is broken in the same way. */
+ PRINT("chmod_extended ( %#lx(%s), %ld, %ld, %ld, %#lx )",
ARG1, ARG1 ? (HChar*)ARG1 : "(null)", ARG2, ARG3, ARG4, ARG5);
PRE_REG_READ5(long, "chmod",
unsigned int, fildes,
@@ -1960,75 +1879,59 @@
}
-PRE(sys_accessx)
+PRE(chflags)
{
- // GrP fixme difficult
-}
-
-POST(sys_accessx)
-{
- // GrP fixme
-}
-
-PRE(sys_chflags)
-{
- PRINT("sys_chflags ( %#lx(%s), %lu )", ARG1, (char *)ARG1, ARG2);
+ PRINT("chflags ( %#lx(%s), %lu )", ARG1, (char *)ARG1, ARG2);
PRE_REG_READ2(int, "chflags", const char *,path, unsigned int,flags);
PRE_MEM_RASCIIZ("chflags(path)", ARG1);
// GrP fixme sanity-check flags value?
}
-PRE(sys_fchflags)
+PRE(fchflags)
{
- PRINT("sys_fchflags ( %ld, %lu )", ARG1, ARG2);
+ PRINT("fchflags ( %ld, %lu )", ARG1, ARG2);
PRE_REG_READ2(int, "fchflags", int,fd, unsigned int,flags);
// GrP fixme sanity-check flags value?
}
-POST(sys_stat64)
+PRE(stat64)
{
- POST_MEM_WRITE( ARG2, sizeof(struct vki_stat64) );
-}
-
-PRE(sys_stat64)
-{
- PRINT("sys_stat64 ( %#lx(%s), %#lx )", ARG1, (char *)ARG1, ARG2);
+ PRINT("stat64 ( %#lx(%s), %#lx )", ARG1, (char *)ARG1, ARG2);
PRE_REG_READ2(long, "stat", const char *,path, struct stat64 *,buf);
PRE_MEM_RASCIIZ("stat64(path)", ARG1);
PRE_MEM_WRITE( "stat64(buf)", ARG2, sizeof(struct vki_stat64) );
}
-
-
-POST(sys_lstat64)
+POST(stat64)
{
POST_MEM_WRITE( ARG2, sizeof(struct vki_stat64) );
}
-PRE(sys_lstat64)
+PRE(lstat64)
{
- PRINT("sys_lstat64 ( %#lx(%s), %#lx )", ARG1, (char *)ARG1, ARG2);
+ PRINT("lstat64 ( %#lx(%s), %#lx )", ARG1, (char *)ARG1, ARG2);
PRE_REG_READ2(long, "stat", const char *,path, struct stat64 *,buf);
PRE_MEM_RASCIIZ("lstat64(path)", ARG1);
PRE_MEM_WRITE( "lstat64(buf)", ARG2, sizeof(struct vki_stat64) );
}
-
-
-POST(sys_fstat64)
+POST(lstat64)
{
POST_MEM_WRITE( ARG2, sizeof(struct vki_stat64) );
}
-PRE(sys_fstat64)
+PRE(fstat64)
{
- PRINT("sys_fstat64 ( %ld, %#lx )", ARG1,ARG2);
+ PRINT("fstat64 ( %ld, %#lx )", ARG1,ARG2);
PRE_REG_READ2(long, "fstat", unsigned int, fd, struct stat64 *, buf);
PRE_MEM_WRITE( "fstat64(buf)", ARG2, sizeof(struct vki_stat64) );
}
+POST(fstat64)
+{
+ POST_MEM_WRITE( ARG2, sizeof(struct vki_stat64) );
+}
-
-PRE(sys_getfsstat)
+PRE(getfsstat)
{
PRINT("getfsstat(%#lx, %ld, %ld)", ARG1, ARG2, ARG3);
PRE_REG_READ3(int, "getfsstat", struct vki_statfs *, buf,
@@ -2039,7 +1942,7 @@
}
}
-POST(sys_getfsstat)
+POST(getfsstat)
{
if (ARG1) {
// RES is a STRUCT COUNT
@@ -2201,7 +2104,7 @@
PRE_MEM_READ("setattrlist(attrBuf value)", (Addr)attrData, attrDataSize);
}
-PRE(sys_getattrlist)
+PRE(getattrlist)
{
PRINT("getattrlist(%#lx(%s), %#lx, %#lx, %lu, %lu)",
ARG1, (char *)ARG1, ARG2, ARG3, ARG4, ARG5);
@@ -2213,7 +2116,7 @@
PRE_MEM_WRITE("getattrlist(attrBuf)", ARG3, ARG4);
}
-POST(sys_getattrlist)
+POST(getattrlist)
{
if (ARG4 > sizeof(vki_uint32_t)) {
// attrBuf is uint32_t bytes written followed by attr data
@@ -2224,7 +2127,7 @@
}
-PRE(sys_setattrlist)
+PRE(setattrlist)
{
PRINT("setattrlist(%#lx(%s), %#lx, %#lx, %lu, %lu)",
ARG1, (char *)ARG1, ARG2, ARG3, ARG4, ARG5);
@@ -2237,7 +2140,7 @@
}
-PRE(sys_getdirentriesattr)
+PRE(getdirentriesattr)
{
PRINT("getdirentriesattr(%ld, %#lx, %#lx, %ld, %#lx, %#lx, %#lx, %ld)",
ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7, ARG8);
@@ -2255,7 +2158,7 @@
PRE_MEM_WRITE("getdirentriesattr(newState)", ARG7, sizeof(unsigned int));
}
-POST(sys_getdirentriesattr)
+POST(getdirentriesattr)
{
char *p, *end;
unsigned int count;
@@ -2280,7 +2183,7 @@
}
-PRE(sys_fsctl)
+PRE(fsctl)
{
PRINT("fsctl ( %#lx(%s), %ld, %#lx, %ld )",
ARG1, (char *)ARG1, ARG2, ARG3, ARG4);
@@ -2321,7 +2224,7 @@
}
}
-POST(sys_fsctl)
+POST(fsctl)
{
switch (ARG2) {
case VKI_afpfsByteRangeLock2FSCTL: {
@@ -2339,9 +2242,9 @@
}
}
-PRE(sys_initgroups)
+PRE(initgroups)
{
- PRINT("sys_initgroups(%s, %#lx, %lu)", (char *)ARG1, ARG2, ARG3);
+ PRINT("initgroups(%s, %#lx, %lu)", (char *)ARG1, ARG2, ARG3);
PRE_REG_READ3(long, "initgroups",
int, setlen, vki_gid_t *, gidset, vki_uid_t, gmuid);
PRE_MEM_READ("gidset", ARG2, ARG1 * sizeof(vki_gid_t));
@@ -2390,7 +2293,7 @@
}
return VG_(mk_SysRes_Success)(0);
}
-PRE(sys_posix_spawn)
+PRE(posix_spawn)
{
Char* path = NULL; /* path to executable */
Char** envp = NULL;
@@ -2406,7 +2309,7 @@
char** argv
char** envp
*/
- PRINT("sys_posix_spawn( %#lx, %#lx(%s), %#lx, %#lx, %#lx )",
+ PRINT("posix_spawn( %#lx, %#lx(%s), %#lx, %#lx, %#lx )",
ARG1, ARG2, ARG2 ? (HChar*)ARG2 : "(null)", ARG3, ARG4, ARG5 );
/* Standard pre-syscall checks */
@@ -2424,7 +2327,7 @@
"posix_spawn(envp[i])" );
if (0)
- VG_(printf)("sys_posix_spawn( %#lx, %#lx(%s), %#lx, %#lx, %#lx )\n",
+ VG_(printf)("posix_spawn( %#lx, %#lx(%s), %#lx, %#lx, %#lx )\n",
ARG1, ARG2, ARG2 ? (HChar*)ARG2 : "(null)", ARG3, ARG4, ARG5 );
/* Now follows a bunch of logic copied from PRE(sys_execve) in
@@ -2571,20 +2474,20 @@
/* not to mention .. */
*flags |= SfMayBlock;
}
-POST(sys_posix_spawn)
+POST(posix_spawn)
{
vg_assert(SUCCESS);
//POST_MEM_WRITE( ARG1, sizeof(vki_pid_t) );
}
-PRE(sys_socket)
+PRE(socket)
{
- PRINT("sys_socket ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
+ PRINT("socket ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "socket", int, domain, int, type, int, protocol);
}
-POST(sys_socket)
+POST(socket)
{
SysRes r;
vg_assert(SUCCESS);
@@ -2593,9 +2496,9 @@
}
-PRE(sys_setsockopt)
+PRE(setsockopt)
{
- PRINT("sys_setsockopt ( %ld, %ld, %ld, %#lx, %ld )",
+ PRINT("setsockopt ( %ld, %ld, %ld, %#lx, %ld )",
ARG1,ARG2,ARG3,ARG4,ARG5);
PRE_REG_READ5(long, "setsockopt",
int, s, int, level, int, optname,
@@ -2604,11 +2507,11 @@
}
-PRE(sys_getsockopt)
+PRE(getsockopt)
{
Addr optval_p = ARG4;
Addr optlen_p = ARG5;
- PRINT("sys_getsockopt ( %ld, %ld, %ld, %#lx, %#lx )",
+ PRINT("getsockopt ( %ld, %ld, %ld, %#lx, %#lx )",
ARG1,ARG2,ARG3,ARG4,ARG5);
PRE_REG_READ5(long, "getsockopt",
int, s, int, level, int, optname,
@@ -2625,7 +2528,7 @@
// DDD: #warning GrP fixme darwin-specific sockopts
}
-POST(sys_getsockopt)
+POST(getsockopt)
{
Addr optval_p = ARG4;
Addr optlen_p = ARG5;
@@ -2639,26 +2542,26 @@
}
-PRE(sys_connect)
+PRE(connect)
{
*flags |= SfMayBlock;
- PRINT("sys_connect ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
+ PRINT("connect ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "connect",
int, sockfd, struct sockaddr *, serv_addr, int, addrlen);
ML_(generic_PRE_sys_connect)(tid, ARG1,ARG2,ARG3);
}
-PRE(sys_accept)
+PRE(accept)
{
*flags |= SfMayBlock;
- PRINT("sys_accept ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
+ PRINT("accept ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "accept",
int, s, struct sockaddr *, addr, int, *addrlen);
ML_(generic_PRE_sys_accept)(tid, ARG1,ARG2,ARG3);
}
-POST(sys_accept)
+POST(accept)
{
SysRes r;
vg_assert(SUCCESS);
@@ -2668,10 +2571,10 @@
}
-PRE(sys_sendto)
+PRE(sendto)
{
*flags |= SfMayBlock;
- PRINT("sys_sendto ( %ld, %s, %ld, %lu, %#lx, %ld )",
+ PRINT("sendto ( %ld, %s, %ld, %lu, %#lx, %ld )",
ARG1,(char *)ARG2,ARG3,ARG4,ARG5,ARG6);
PRE_REG_READ6(long, "sendto",
int, s, const void *, msg, int, len,
@@ -2680,10 +2583,10 @@
ML_(generic_PRE_sys_sendto)(tid, ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
}
-PRE(sys_sendfile)
+PRE(sendfile)
{
#if VG_WORDSIZE == 4
- PRINT("sys_sendfile(%ld, %ld, %llu, %#lx, %#lx, %ld)",
+ PRINT("sendfile(%ld, %ld, %llu, %#lx, %#lx, %ld)",
ARG1, ARG2, LOHI64(ARG3, ARG4), ARG5, ARG6, ARG7);
PRE_REG_READ7(long, "sendfile",
@@ -2693,7 +2596,7 @@
PRE_MEM_WRITE("sendfile(nwritten)", ARG5, sizeof(vki_uint64_t));
if (ARG6) PRE_MEM_WRITE("sendfile(sf_header)", ARG6, sizeof(struct sf_hdtr));
#else
- PRINT("sys_sendfile(%ld, %ld, %ld, %#lx, %#lx, %ld)",
+ PRINT("sendfile(%ld, %ld, %ld, %#lx, %#lx, %ld)",
ARG1, ARG2, ARG3, ARG4, ARG5, ARG6);
PRE_REG_READ6(long, "sendfile",
@@ -2706,8 +2609,7 @@
*flags |= SfMayBlock;
}
-
-POST(sys_sendfile)
+POST(sendfile)
{
#if VG_WORDSIZE == 4
POST_MEM_WRITE(ARG5, sizeof(vki_uint64_t));
@@ -2718,10 +2620,10 @@
#endif
}
-PRE(sys_recvfrom)
+PRE(recvfrom)
{
*flags |= SfMayBlock;
- PRINT("sys_recvfrom ( %ld, %#lx, %ld, %lu, %#lx, %#lx )",
+ PRINT("recvfrom ( %ld, %#lx, %ld, %lu, %#lx, %#lx )",
ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
PRE_REG_READ6(long, "recvfrom",
int, s, void *, buf, int, len, unsigned int, flags,
@@ -2729,7 +2631,7 @@
ML_(generic_PRE_sys_recvfrom)(tid, ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
}
-POST(sys_recvfrom)
+POST(recvfrom)
{
vg_assert(SUCCESS);
ML_(generic_POST_sys_recvfrom)(tid, VG_(mk_SysRes_Success)(RES),
@@ -2737,63 +2639,63 @@
}
-PRE(sys_sendmsg)
+PRE(sendmsg)
{
*flags |= SfMayBlock;
- PRINT("sys_sendmsg ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
+ PRINT("sendmsg ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "sendmsg",
int, s, const struct msghdr *, msg, int, flags);
ML_(generic_PRE_sys_sendmsg)(tid, ARG1,ARG2);
}
-PRE(sys_recvmsg)
+PRE(recvmsg)
{
*flags |= SfMayBlock;
- PRINT("sys_recvmsg ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
+ PRINT("recvmsg ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "recvmsg", int, s, struct msghdr *, msg, int, flags);
ML_(generic_PRE_sys_recvmsg)(tid, ARG1,ARG2);
}
-POST(sys_recvmsg)
+POST(recvmsg)
{
ML_(generic_POST_sys_recvmsg)(tid, ARG1,ARG2);
}
-PRE(sys_shutdown)
+PRE(shutdown)
{
*flags |= SfMayBlock;
- PRINT("sys_shutdown ( %ld, %ld )",ARG1,ARG2);
+ PRINT("shutdown ( %ld, %ld )",ARG1,ARG2);
PRE_REG_READ2(int, "shutdown", int, s, int, how);
}
-PRE(sys_bind)
+PRE(bind)
{
- PRINT("sys_bind ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
+ PRINT("bind ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "bind",
int, sockfd, struct sockaddr *, my_addr, int, addrlen);
ML_(generic_PRE_sys_bind)(tid, ARG1,ARG2,ARG3);
}
-PRE(sys_listen)
+PRE(listen)
{
- PRINT("sys_listen ( %ld, %ld )",ARG1,ARG2);
+ PRINT("listen ( %ld, %ld )",ARG1,ARG2);
PRE_REG_READ2(long, "listen", int, s, int, backlog);
}
-PRE(sys_getsockname)
+PRE(getsockname)
{
- PRINT("sys_getsockname ( %ld, %#lx, %#lx )",ARG1,ARG2,ARG3);
+ PRINT("getsockname ( %ld, %#lx, %#lx )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "getsockname",
int, s, struct sockaddr *, name, int *, namelen);
ML_(generic_PRE_sys_getsockname)(tid, ARG1,ARG2,ARG3);
}
-POST(sys_getsockname)
+POST(getsockname)
{
vg_assert(SUCCESS);
ML_(generic_POST_sys_getsockname)(tid, VG_(mk_SysRes_Success)(RES),
@@ -2801,15 +2703,15 @@
}
-PRE(sys_getpeername)
+PRE(getpeername)
{
- PRINT("sys_getpeername ( %ld, %#lx, %#lx )",ARG1,ARG2,ARG3);
+ PRINT("getpeername ( %ld, %#lx, %#lx )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "getpeername",
int, s, struct sockaddr *, name, int *, namelen);
ML_(generic_PRE_sys_getpeername)(tid, ARG1,ARG2,ARG3);
}
-POST(sys_getpeername)
+POST(getpeername)
{
vg_assert(SUCCESS);
ML_(generic_POST_sys_getpeername)(tid, VG_(mk_SysRes_Success)(RES),
@@ -2817,15 +2719,15 @@
}
-PRE(sys_socketpair)
+PRE(socketpair)
{
- PRINT("sys_socketpair ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
+ PRINT("socketpair ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "socketpair",
int, d, int, type, int, protocol, int *, sv);
ML_(generic_PRE_sys_socketpair)(tid, ARG1,ARG2,ARG3,ARG4);
}
-POST(sys_socketpair)
+POST(socketpair)
{
vg_assert(SUCCESS);
ML_(generic_POST_sys_socketpair)(tid, VG_(mk_SysRes_Success)(RES),
@@ -2833,9 +2735,9 @@
}
-PRE(sys_gethostuuid)
+PRE(gethostuuid)
{
- PRINT("sys_gethostuuid ( %#lx, %#lx )", ARG1, ARG2);
+ PRINT("gethostuuid ( %#lx, %#lx )", ARG1, ARG2);
PRE_REG_READ2(int,"gethostuuid",
char *,"uuid_buf",
const struct vki_timespec *,"timeout");
@@ -2847,19 +2749,19 @@
}
-POST(sys_gethostuuid)
+POST(gethostuuid)
{
POST_MEM_WRITE(ARG1, 16);
}
/* Darwin pipe() returns the two descriptors in two registers. */
-PRE(sys_pipe)
+PRE(pipe)
{
- PRINT("sys_pipe ( )");
+ PRINT("pipe ( )");
PRE_REG_READ0(int, "pipe");
}
-POST(sys_pipe)
+POST(pipe)
{
Int p0, p1;
vg_assert(SUCCESS);
@@ -2880,7 +2782,7 @@
}
-PRE(sys_getlogin)
+PRE(getlogin)
{
PRINT("getlogin ( %#lx, %ld )", ARG1, ARG2);
PRE_REG_READ2(long, "getlogin",
@@ -2889,13 +2791,13 @@
PRE_MEM_WRITE("getlogin(namebuf)", ARG1, ARG2);
}
-POST(sys_getlogin)
+POST(getlogin)
{
POST_MEM_WRITE(ARG1, ARG2);
}
-PRE(sys_ptrace)
+PRE(ptrace)
{
PRINT("ptrace ( %ld, %ld, %#lx, %ld )", ARG1, ARG2, ARG3, ARG4);
PRE_REG_READ4(long, "ptrace",
@@ -2908,26 +2810,26 @@
}
-PRE(sys_issetugid)
+PRE(issetugid)
{
PRINT("issetugid ( )");
PRE_REG_READ0(long, "issetugid");
}
-PRE(sys_getdtablesize)
+PRE(getdtablesize)
{
PRINT("getdtablesize ( )");
PRE_REG_READ0(long, "getdtablesize");
}
-POST(sys_getdtablesize)
+POST(getdtablesize)
{
// Subtract Valgrind's fd range from client's dtable
if (RES > VG_(fd_hard_limit)) SET_STATUS_Success(VG_(fd_hard_limit));
}
-PRE(sys_lseek)
+PRE(lseek)
{
PRINT("lseek ( %ld, %ld, %ld )", ARG1,ARG2,ARG3);
PRE_REG_READ4(vki_off_t, "lseek",
@@ -2936,7 +2838,7 @@
}
-PRE(sys_pathconf)
+PRE(pathconf)
{
PRINT("pathconf(%#lx(%s), %ld)", ARG1,(char *)ARG1,ARG2);
PRE_REG_READ2(long,"pathconf", const char *,"path", int,"name");
@@ -2944,7 +2846,7 @@
}
-PRE(sys_fpathconf)
+PRE(fpathconf)
{
PRINT("fpathconf(%ld, %ld)", ARG1,ARG2);
PRE_REG_READ2(long,"fpathconf", int,"fd", int,"name");
@@ -2954,7 +2856,7 @@
}
-PRE(sys_getdirentries)
+PRE(getdirentries)
{
PRINT("getdirentries(%ld, %#lx, %ld, %#lx)", ARG1, ARG2, ARG3, ARG4);
PRE_REG_READ4(int, "getdirentries",
@@ -2963,7 +2865,7 @@
PRE_MEM_WRITE("getdirentries(buf)", ARG2, ARG3);
}
-POST(sys_getdirentries)
+POST(getdirentries)
{
POST_MEM_WRITE(ARG4, sizeof(long));
// GrP fixme be specific about d_name?
@@ -2971,7 +2873,7 @@
}
-PRE(sys_getdirentries64)
+PRE(getdirentries64)
{
PRINT("getdirentries64(%ld, %#lx, %lu, %#lx)", ARG1, ARG2, ARG3, ARG4);
PRE_REG_READ4(vki_ssize_t, "getdirentries",
@@ -2979,8 +2881,7 @@
PRE_MEM_WRITE("getdirentries(position)", ARG4, sizeof(vki_off_t));
PRE_MEM_WRITE("getdirentries(buf)", ARG2, ARG3);
}
-
-POST(sys_getdirentries64)
+POST(getdirentries64)
{
POST_MEM_WRITE(ARG4, sizeof(vki_off_t));
// GrP fixme be specific about d_name? (fixme copied from 32 bit version)
@@ -2988,36 +2889,34 @@
}
-PRE(sys_statfs64)
+PRE(statfs64)
{
- PRINT("sys_statfs64 ( %#lx(%s), %#lx )",ARG1,(char *)ARG1,ARG2);
+ PRINT("statfs64 ( %#lx(%s), %#lx )",ARG1,(char *)ARG1,ARG2);
PRE_REG_READ2(long, "statfs64", const char *, path, struct statfs64 *, buf);
PRE_MEM_RASCIIZ( "statfs64(path)", ARG1 );
PRE_MEM_WRITE( "statfs64(buf)", ARG2, sizeof(struct vki_statfs64) );
}
-
-POST(sys_statfs64)
+POST(statfs64)
{
POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs64) );
}
-PRE(sys_fstatfs64)
+PRE(fstatfs64)
{
- PRINT("sys_fstatfs64 ( %ld, %#lx )",ARG1,ARG2);
+ PRINT("fstatfs64 ( %ld, %#lx )",ARG1,ARG2);
PRE_REG_READ2(long, "fstatfs64",
unsigned int, fd, struct statfs *, buf);
PRE_MEM_WRITE( "fstatfs64(buf)", ARG2, sizeof(struct vki_statfs64) );
}
-
-POST(sys_fstatfs64)
+POST(fstatfs64)
{
POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs64) );
}
-PRE(sys_csops)
+PRE(csops)
{
- PRINT("sys_csops ( %ld, %#lx, %#lx, %lu )", ARG1, ARG2, ARG3, ARG4);
+ PRINT("csops ( %ld, %#lx, %#lx, %lu )", ARG1, ARG2, ARG3, ARG4);
PRE_REG_READ4(int, "csops",
vki_pid_t, pid, uint32_t, ops,
void *, useraddr, vki_size_t, usersize);
@@ -3036,14 +2935,14 @@
}
}
-POST(sys_csops)
+POST(csops)
{
POST_MEM_WRITE( ARG3, ARG4 );
}
-PRE(sys_auditon)
+PRE(auditon)
{
- PRINT("sys_auditon ( %ld, %#lx, %ld )", ARG1, ARG2, ARG3);
+ PRINT("auditon ( %ld, %#lx, %ld )", ARG1, ARG2, ARG3);
PRE_REG_READ3(int,"auditon",
int,"cmd", void*,"data", unsigned int,"length");
@@ -3096,8 +2995,7 @@
break;
}
}
-
-POST(sys_auditon)
+POST(auditon)
{
switch (ARG1) {
@@ -3147,12 +3045,12 @@
}
-PRE(sys_mmap)
+PRE(mmap)
{
// SysRes r;
#if VG_WORDSIZE == 4
- PRINT("sys_mmap ( %#lx, %lu, %ld, %ld, %ld, %lld )",
+ PRINT("mmap ( %#lx, %lu, %ld, %ld, %ld, %lld )",
ARG1, ARG2, ARG3, ARG4, ARG5, LOHI64(ARG6, ARG7) );
PRE_REG_READ7(Addr, "mmap",
Addr,start, vki_size_t,length, int,prot, int,flags, int,fd,
@@ -3162,7 +3060,7 @@
// r = ML_(generic_PRE_sys_mmap)( tid, ARG1, ARG2, ARG3, ARG4, ARG5,
// (Off64T)LOHI64(ARG6, ARG7) );
#else
- PRINT("sys_mmap ( %#lx, %lu, %ld, %ld, %ld, %ld )",
+ PRINT("mmap ( %#lx, %lu, %ld, %ld, %ld, %ld )",
ARG1, ARG2, ARG3, ARG4, ARG5, ARG6 );
PRE_REG_READ6(long, "mmap",
Addr,start, vki_size_t,length, int,prot, int,flags, int,fd,
@@ -3174,7 +3072,7 @@
// SET_STATUS_from_SysRes(r);
}
-POST(sys_mmap)
+POST(mmap)
{
if (RES != -1) {
ML_(notify_core_and_tool_of_mmap)(RES, ARG2, ARG3, ARG4, ARG5, ARG6);
@@ -3184,12 +3082,12 @@
}
-PRE(sys_sysctl)
+PRE(__sysctl)
{
- PRINT( "sysctl ( %#lx, %ld, %#lx, %#lx, %#lx, %ld )",
+ PRINT( "__sysctl ( %#lx, %ld, %#lx, %#lx, %#lx, %ld )",
ARG1, ARG2, ARG3, ARG4, ARG5, ARG6 );
- PRE_REG_READ6(int, "sysctl", int*, name, unsigned int, namelen,
+ PRE_REG_READ6(int, "__sysctl", int*, name, unsigned int, namelen,
void*, oldp, vki_size_t *, oldlenp,
void*, newp, vki_size_t *, newlenp);
@@ -3265,7 +3163,7 @@
}
}
-POST(sys_sysctl)
+POST(__sysctl)
{
if (SUCCESS || ERR == VKI_ENOMEM) {
// sysctl can write truncated data and return VKI_ENOMEM
@@ -3279,20 +3177,19 @@
}
-PRE(sys_sigpending)
+PRE(sigpending)
{
- PRINT( "sys_sigpending ( %#lx )", ARG1 );
+ PRINT( "sigpending ( %#lx )", ARG1 );
PRE_REG_READ1(long, "sigpending", vki_sigset_t *, set);
PRE_MEM_WRITE( "sigpending(set)", ARG1, sizeof(vki_sigset_t));
}
-
-POST(sys_sigpending)
+POST(sigpending)
{
POST_MEM_WRITE( ARG1, sizeof(vki_sigset_t) ) ;
}
-PRE(sys_sigprocmask)
+PRE(sigprocmask)
{
UWord arg1;
PRINT("sigprocmask ( %ld, %#lx, %#lx )", ARG1, ARG2, ARG3);
@@ -3328,7 +3225,7 @@
*flags |= SfPollAfter;
}
-POST(sys_sigprocmask)
+POST(sigprocmask)
{
vg_assert(SUCCESS);
if (RES == 0 && ARG3 != 0)
@@ -3336,7 +3233,7 @@
}
-PRE(sys_sigsuspend)
+PRE(sigsuspend)
{
/* Just hand this off to the kernel. Is that really correct? And
shouldn't we at least set SfPollAfter? These questions apply to
@@ -3344,7 +3241,7 @@
/* I think the first arg is the 32-bit signal mask (by value), and
the other two args are ignored. */
*flags |= SfMayBlock;
- PRINT("sys_sigsuspend ( mask=0x%08lx )", ARG1 );
+ PRINT("sigsuspend ( mask=0x%08lx )", ARG1 );
PRE_REG_READ1(int, "sigsuspend", int, sigmask);
}
@@ -5741,7 +5638,7 @@
}
-PRE(sys_bsdthread_create)
+PRE(bsdthread_create)
{
ThreadState *tst;
@@ -5762,14 +5659,14 @@
ARG2 = (Word)tst;
// Create a semaphore that pthread_hijack will signal once it starts
- // POST(sys_bsdthread_create) needs to wait for the new memory map to appear
+ // POST(bsdthread_create) needs to wait for the new memory map to appear
semaphore_create(mach_task_self(), &tst->os_state.child_go,
SYNC_POLICY_FIFO, 0);
semaphore_create(mach_task_self(), &tst->os_state.child_done,
SYNC_POLICY_FIFO, 0);
}
-POST(sys_bsdthread_create)
+POST(bsdthread_create)
{
// Tell new thread's pthread_hijack to proceed, and wait for it to finish.
// We hold V's lock on the child's behalf.
@@ -5794,7 +5691,7 @@
}
-PRE(sys_bsdthread_terminate)
+PRE(bsdthread_terminate)
{
ThreadState *tst;
@@ -6599,14 +6496,14 @@
}
-PRE(sys___semwait_signal)
+PRE(__semwait_signal)
{
/* args: int cond_sem, int mutex_sem,
int timeout, int relative,
time_t tv_sec, time_t tv_nsec */
- PRINT("sys___semwait_signal(wait %s, signal %s, %ld, %ld, %lds:%ldns)",
+ PRINT("__semwait_signal(wait %s, signal %s, %ld, %ld, %lds:%ldns)",
name_for_port(ARG1), name_for...
[truncated message content] |