|
From: <sv...@va...> - 2009-02-16 07:10:47
|
Author: njn
Date: 2009-02-16 07:10:42 +0000 (Mon, 16 Feb 2009)
New Revision: 9180
Log:
Make the Darwin syscall table work like the Linux one.
Modified:
branches/DARWIN/coregrind/m_syswrap/syswrap-darwin.c
branches/DARWIN/coregrind/m_syswrap/syswrap-main.c
branches/DARWIN/include/vki/vki-scnums-darwin.h
Modified: branches/DARWIN/coregrind/m_syswrap/syswrap-darwin.c
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/syswrap-darwin.c 2009-02-16 05:52:11 UTC (rev 9179)
+++ branches/DARWIN/coregrind/m_syswrap/syswrap-darwin.c 2009-02-16 07:10:42 UTC (rev 9180)
@@ -6333,15 +6333,15 @@
#define _____(sysno) GENX_(sysno, sys_ni_syscall)
/*
- // _____ : unsupported by the kernel
- _____ : unimplemented in valgrind (sys_ni_syscall)
+ _____ : unsupported by the kernel (sys_ni_syscall)
+ // _____ : unimplemented in valgrind
GEN : handlers are in syswrap-generic.c
MAC : handlers are in this file
X_ : PRE handler only
XY : PRE and POST handlers
*/
const SyscallTableEntry ML_(syscall_table)[] = {
- _____(__NR_syscall), // 0
+// _____(__NR_syscall), // 0
MACX_(__NR_exit, sys_exit),
GENX_(__NR_fork, sys_fork),
GENXY(__NR_read, sys_read),
@@ -6349,21 +6349,21 @@
GENXY(__NR_open, sys_open),
GENXY(__NR_close, sys_close),
GENXY(__NR_wait4, sys_wait4),
-// _____(__NR_creat),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(8)), // old creat
GENX_(__NR_link, sys_link),
GENX_(__NR_unlink, sys_unlink),
-// _____(__NR_execv),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(11)), // old execv
GENX_(__NR_chdir, sys_chdir),
GENX_(__NR_fchdir, sys_fchdir),
GENX_(__NR_mknod, sys_mknod),
GENX_(__NR_chmod, sys_chmod),
GENX_(__NR_chown, sys_chown),
-// _____(__NR_break),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(17)), // old break
MACXY(__NR_getfsstat, sys_getfsstat),
-// _____(__NR_lseek),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(19)), // old lseek
GENX_(__NR_getpid, sys_getpid), // 20
-// _____(__NR_mount),
-// _____(__NR_umount),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(21)), // old mount
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(22)), // old umount
GENX_(__NR_setuid, sys_setuid),
GENX_(__NR_getuid, sys_getuid),
GENX_(__NR_geteuid, sys_geteuid),
@@ -6379,198 +6379,198 @@
MACX_(__NR_fchflags, sys_fchflags),
GENX_(__NR_sync, sys_sync),
GENX_(__NR_kill, sys_kill),
-// _____(__NR_stat),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(38)), // old stat
GENX_(__NR_getppid, sys_getppid),
-// _____(__NR_lstat), // 40
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(40)), // old lstat
GENXY(__NR_dup, sys_dup),
MACXY(__NR_pipe, sys_pipe),
GENX_(__NR_getegid, sys_getegid),
- _____(__NR_profil),
-// _____(__NR_ktrace),
+// _____(__NR_profil),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(45)), // old ktrace
MACX_(__NR_sigaction, sys_sigaction),
GENX_(__NR_getgid, sys_getgid),
MACXY(__NR_sigprocmask, sys_sigprocmask),
MACXY(__NR_getlogin, sys_getlogin),
- _____(__NR_setlogin),
- _____(__NR_acct),
- _____(__NR_sigpending),
+// _____(__NR_setlogin),
+// _____(__NR_acct),
+// _____(__NR_sigpending),
MACX_(__NR_sigaltstack, sys_sigaltstack),
MACXY(__NR_ioctl, sys_ioctl),
- _____(__NR_reboot),
- _____(__NR_revoke),
- _____(__NR_symlink),
+// _____(__NR_reboot),
+// _____(__NR_revoke),
+// _____(__NR_symlink),
GENX_(__NR_readlink, sys_readlink),
GENX_(__NR_execve, sys_execve),
GENX_(__NR_umask, sys_umask), // 60
GENX_(__NR_chroot, sys_chroot),
-// _____(__NR_fstat),
-// _____(__NR_63),
-// _____(__NR_getpagesize),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(62)), // old fstat
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(63)), // used internally, reserved
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(64)), // old getpagesize
GENX_(__NR_msync, sys_msync),
- _____(__NR_vfork),
-// _____(__NR_vread),
-// _____(__NR_vwrite),
-// _____(__NR_sbrk),
-// _____(__NR_sstk),
-// _____(__NR_mmap),
-// _____(__NR_vadvise),
+// _____(__NR_vfork),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(67)), // old vread
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(68)), // old vwrite
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(69)), // old sbrk
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(70)), // old sstk
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(71)), // old mmap
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(72)), // old vadvise
GENXY(__NR_munmap, sys_munmap),
GENXY(__NR_mprotect, sys_mprotect),
GENX_(__NR_madvise, sys_madvise),
-// _____(__NR_vhangup),
-// _____(__NR_vlimit),
- _____(__NR_mincore),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(76)), // old vhangup
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(77)), // old vlimit
+// _____(__NR_mincore),
GENXY(__NR_getgroups, sys_getgroups),
- _____(__NR_setgroups), // 80
+// _____(__NR_setgroups), // 80
GENX_(__NR_getpgrp, sys_getpgrp),
- _____(__NR_setpgid),
+// _____(__NR_setpgid),
GENX_(__NR_setitimer, sys_setitimer),
-// _____(__NR_wait),
- _____(__NR_swapon),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(84)), // old wait
+// _____(__NR_swapon),
GENX_(__NR_getitimer, sys_getitimer),
-// _____(__NR_gethostname),
-// _____(__NR_sethostname),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(87)), // old gethostname
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(88)), // old sethostname
MACXY(__NR_getdtablesize, sys_getdtablesize),
GENX_(__NR_dup2, sys_dup2),
-// _____(__NR_getdopt),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(91)), // old getdopt
MACXY(__NR_fcntl, sys_fcntl),
GENX_(__NR_select, sys_select),
-// _____(__NR_setdopt),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(94)), // old setdopt
GENX_(__NR_fsync, sys_fsync),
GENX_(__NR_setpriority, sys_setpriority),
MACXY(__NR_socket, sys_socket),
MACX_(__NR_connect, sys_connect),
-// _____(__NR_accept),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(99)), // old accept
GENX_(__NR_getpriority, sys_getpriority), // 100
-// _____(__NR_send),
-// _____(__NR_recv),
-// _____(__NR_sigreturn),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(101)), // old send
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(102)), // old recv
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(103)), // old sigreturn
MACX_(__NR_bind, sys_bind),
MACX_(__NR_setsockopt, sys_setsockopt),
MACX_(__NR_listen, sys_listen),
-// _____(__NR_vtimes),
-// _____(__NR_sigvec),
-// _____(__NR_sigblock),
-// _____(__NR_sigsetmask),
- _____(__NR_sigsuspend),
-// _____(__NR_sigstack),
-// _____(__NR_recvmsg),
-// _____(__NR_sendmsg),
-// _____(__NR_vtrace),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(107)), // old vtimes
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(108)), // old sigvec
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(109)), // old sigblock
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(110)), // old sigsetmask
+// _____(__NR_sigsuspend),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(112)), // old sigstack
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(113)), // old recvmsg
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(114)), // old sendmsg
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(115)), // old vtrace
GENXY(__NR_gettimeofday, sys_gettimeofday),
GENXY(__NR_getrusage, sys_getrusage),
MACXY(__NR_getsockopt, sys_getsockopt),
-// _____(__NR_resuba),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(119)), // old resuba
GENXY(__NR_readv, sys_readv), // 120
GENX_(__NR_writev, sys_writev),
- _____(__NR_settimeofday),
+// _____(__NR_settimeofday),
GENX_(__NR_fchown, sys_fchown),
GENX_(__NR_fchmod, sys_fchmod),
-// _____(__NR_recvfrom),
- _____(__NR_setreuid),
- _____(__NR_setregid),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(125)), // old recvfrom
+// _____(__NR_setreuid),
+// _____(__NR_setregid),
GENX_(__NR_rename, sys_rename),
-// _____(__NR_truncate),
-// _____(__NR_ftruncate),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(129)), // old truncate
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(130)), // old ftruncate
GENX_(__NR_flock, sys_flock),
- _____(__NR_mkfifo),
+// _____(__NR_mkfifo),
MACX_(__NR_sendto, sys_sendto),
MACX_(__NR_shutdown, sys_shutdown),
MACXY(__NR_socketpair, sys_socketpair),
GENX_(__NR_mkdir, sys_mkdir),
GENX_(__NR_rmdir, sys_rmdir),
GENX_(__NR_utimes, sys_utimes),
- _____(__NR_futimes),
- _____(__NR_adjtime), // 140
-// _____(__NR_getpeername),
+// _____(__NR_futimes),
+// _____(__NR_adjtime), // 140
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(141)), // old getpeername
MACXY(__NR_gethostuuid, sys_gethostuuid),
-// _____(__NR_sethostid),
-// _____(__NR_getrlimit),
-// _____(__NR_setrlimit),
-// _____(__NR_killpg),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(143)), // old sethostid
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(144)), // old getrlimit
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(145)), // old setrlimit
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(146)), // old killpg
GENX_(__NR_setsid, sys_setsid),
-// _____(__NR_setquota),
-// _____(__NR_qquota),
-// _____(__NR_getsockname),
- _____(__NR_getpgid),
- _____(__NR_setprivexec),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(148)), // old setquota
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(149)), // old qquota
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(150)), // old getsockname
+// _____(__NR_getpgid),
+// _____(__NR_setprivexec),
GENXY(__NR_pread, sys_pread64),
GENX_(__NR_pwrite, sys_pwrite64),
- _____(__NR_nfssvc),
-// _____(__NR_getdirentries),
+// _____(__NR_nfssvc),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(156)), // old getdirentries
GENXY(__NR_statfs, sys_statfs),
GENXY(__NR_fstatfs, sys_fstatfs),
- _____(__NR_unmount),
-// _____(__NR_async_daemon), // 160
- _____(__NR_getfh),
-// _____(__NR_getdomainname),
-// _____(__NR_setdomainname),
-// _____(__NR_164),
- _____(__NR_quotactl),
-// _____(__NR_exportfs),
- _____(__NR_mount),
-// _____(__NR_ustat),
- _____(__NR_csops),
-// _____(__NR_table),
-// _____(__NR_wait3),
-// _____(__NR_rpause),
- _____(__NR_waitid),
-// _____(__NR_getdents),
-// _____(__NR_gc_control),
- _____(__NR_add_profil),
-// _____(__NR_177),
-// _____(__NR_178),
-// _____(__NR_179),
+// _____(__NR_unmount),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(160)), // old async_daemon
+// _____(__NR_getfh),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(162)), // old getdomainname
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(163)), // old setdomainname
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(164)), // ???
+// _____(__NR_quotactl),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(166)), // old exportfs
+// _____(__NR_mount),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(168)), // old ustat
+// _____(__NR_csops),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(170)), // old table
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(171)), // old wait3
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(172)), // old rpause
+// _____(__NR_waitid),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(174)), // old getdents
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(175)), // old gc_control
+// _____(__NR_add_profil),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(177)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(178)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(179)), // ???
MACX_(__NR_kdebug_trace, sys_kdebug_trace), // 180
GENX_(__NR_setgid, sys_setgid),
MACX_(__NR_setegid, sys_setegid),
MACX_(__NR_seteuid, sys_seteuid),
- _____(__NR_sigreturn),
- _____(__NR_chud),
-// _____(__NR_186),
-// _____(__NR_187),
+// _____(__NR_sigreturn),
+// _____(__NR_chud),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(186)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(187)), // ???
GENXY(__NR_stat, sys_newstat),
GENXY(__NR_fstat, sys_newfstat),
GENXY(__NR_lstat, sys_newlstat),
MACX_(__NR_pathconf, sys_pathconf),
MACX_(__NR_fpathconf, sys_fpathconf),
-// _____(__NR_193),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(193)), // ???
GENXY(__NR_getrlimit, sys_getrlimit),
GENX_(__NR_setrlimit, sys_setrlimit),
MACXY(__NR_getdirentries, sys_getdirentries),
MACXY(__NR_mmap, sys_mmap),
-// _____(__NR___syscall),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(198)), // __syscall
MACX_(__NR_lseek, sys_lseek),
GENX_(__NR_truncate, sys_truncate64), // 200
GENX_(__NR_ftruncate, sys_ftruncate64),
MACXY(__NR___sysctl, sys_sysctl),
GENX_(__NR_mlock, sys_mlock),
GENX_(__NR_munlock, sys_munlock),
- _____(__NR_undelete),
- _____(__NR_ATsocket),
- _____(__NR_ATgetmsg),
- _____(__NR_ATputmsg),
- _____(__NR_ATPsndreq),
- _____(__NR_ATPsndrsp),
- _____(__NR_ATPgetreq),
- _____(__NR_ATPgetrsp),
-// _____(__NR_213),
- _____(__NR_kqueue_from_portset_np),
- _____(__NR_kqueue_portset_np),
- _____(__NR_mkcomplex),
- _____(__NR_statv),
- _____(__NR_lstatv),
- _____(__NR_fstatv),
+// _____(__NR_undelete),
+// _____(__NR_ATsocket),
+// _____(__NR_ATgetmsg),
+// _____(__NR_ATputmsg),
+// _____(__NR_ATPsndreq),
+// _____(__NR_ATPsndrsp),
+// _____(__NR_ATPgetreq),
+// _____(__NR_ATPgetrsp),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(213)), // Reserved for AppleTalk
+// _____(__NR_kqueue_from_portset_np),
+// _____(__NR_kqueue_portset_np),
+// _____(__NR_mkcomplex),
+// _____(__NR_statv),
+// _____(__NR_lstatv),
+// _____(__NR_fstatv),
MACXY(__NR_getattrlist, sys_getattrlist), // 220
MACX_(__NR_setattrlist, sys_setattrlist),
MACXY(__NR_getdirentriesattr, sys_getdirentriesattr),
- _____(__NR_exchangedata),
-// _____(__NR_checkuseraccess),
- _____(__NR_searchfs),
+// _____(__NR_exchangedata),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(224)), // checkuseraccess
+// _____(__NR_searchfs),
GENX_(__NR_delete, sys_unlink),
- _____(__NR_copyfile),
-// _____(__NR_228),
-// _____(__NR_229),
+// _____(__NR_copyfile),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(228)), // ??
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(229)), // ??
GENXY(__NR_poll, sys_poll),
MACX_(__NR_watchevent, sys_watchevent),
MACXY(__NR_waitevent, sys_waitevent),
@@ -6579,170 +6579,170 @@
MACXY(__NR_fgetxattr, sys_fgetxattr),
MACX_(__NR_setxattr, sys_setxattr),
MACX_(__NR_fsetxattr, sys_fsetxattr),
- _____(__NR_removexattr),
- _____(__NR_fremovexattr),
+// _____(__NR_removexattr),
+// _____(__NR_fremovexattr),
MACXY(__NR_listxattr, sys_listxattr), // 240
- _____(__NR_flistxattr),
+// _____(__NR_flistxattr),
MACXY(__NR_fsctl, sys_fsctl),
MACX_(__NR_initgroups, sys_initgroups),
- _____(__NR_posix_spawn),
-// _____(__NR_245),
-// _____(__NR_246),
- _____(__NR_nfsclnt),
- _____(__NR_fhopen),
-// _____(__NR_249),
- _____(__NR_minherit),
- _____(__NR_semsys),
- _____(__NR_msgsys),
- _____(__NR_shmsys),
+// _____(__NR_posix_spawn),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(245)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(246)), // ???
+// _____(__NR_nfsclnt),
+// _____(__NR_fhopen),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(249)), // ???
+// _____(__NR_minherit),
+// _____(__NR_semsys),
+// _____(__NR_msgsys),
+// _____(__NR_shmsys),
MACXY(__NR_semctl, sys_semctl),
MACX_(__NR_semget, sys_semget),
MACX_(__NR_semop, sys_semop),
-// _____(__NR_257),
- _____(__NR_msgctl),
- _____(__NR_msgget),
- _____(__NR_msgsnd), // 260
- _____(__NR_msgrcv),
- _____(__NR_shmat),
- _____(__NR_shmctl),
- _____(__NR_shmdt),
- _____(__NR_shmget),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(257)), // ???
+// _____(__NR_msgctl),
+// _____(__NR_msgget),
+// _____(__NR_msgsnd), // 260
+// _____(__NR_msgrcv),
+// _____(__NR_shmat),
+// _____(__NR_shmctl),
+// _____(__NR_shmdt),
+// _____(__NR_shmget),
MACXY(__NR_shm_open, sys_shm_open),
- _____(__NR_shm_unlink),
- _____(__NR_sem_open),
- _____(__NR_sem_close),
- _____(__NR_sem_unlink),
- _____(__NR_sem_wait),
- _____(__NR_sem_trywait),
- _____(__NR_sem_post),
- _____(__NR_sem_getvalue),
- _____(__NR_sem_init),
- _____(__NR_sem_destroy),
- _____(__NR_open_extended),
- _____(__NR_umask_extended),
+// _____(__NR_shm_unlink),
+// _____(__NR_sem_open),
+// _____(__NR_sem_close),
+// _____(__NR_sem_unlink),
+// _____(__NR_sem_wait),
+// _____(__NR_sem_trywait),
+// _____(__NR_sem_post),
+// _____(__NR_sem_getvalue),
+// _____(__NR_sem_init),
+// _____(__NR_sem_destroy),
+// _____(__NR_open_extended),
+// _____(__NR_umask_extended),
MACXY(__NR_stat_extended, sys_statx),
- _____(__NR_lstat_extended), // 280
- _____(__NR_fstat_extended),
- _____(__NR_chmod_extended),
- _____(__NR_fchmod_extended),
- _____(__NR_access_extended),
+// _____(__NR_lstat_extended), // 280
+// _____(__NR_fstat_extended),
+// _____(__NR_chmod_extended),
+// _____(__NR_fchmod_extended),
+// _____(__NR_access_extended),
MACX_(__NR_settid, sys_settid),
- _____(__NR_gettid),
- _____(__NR_setsgroups),
- _____(__NR_getsgroups),
- _____(__NR_setwgroups),
- _____(__NR_getwgroups),
- _____(__NR_mkfifo_extended),
- _____(__NR_mkdir_extended),
- _____(__NR_identitysvc),
- _____(__NR_shared_region_check_np),
- _____(__NR_shared_region_map_np),
-// _____(__NR_load_shared_file),
-// _____(__NR_reset_shared_file),
-// _____(__NR_new_system_shared_regions),
-// _____(__NR_shared_region_map_file_np),
-// _____(__NR_shared_region_make_private_np), // 300
- _____(__NR___pthread_mutex_destroy),
- _____(__NR___pthread_mutex_init),
- _____(__NR___pthread_mutex_lock),
- _____(__NR___pthread_mutex_trylock),
- _____(__NR___pthread_mutex_unlock),
- _____(__NR___pthread_cond_init),
- _____(__NR___pthread_cond_destroy),
- _____(__NR___pthread_cond_broadcast),
- _____(__NR___pthread_cond_signal),
- _____(__NR_getsid),
- _____(__NR_settid_with_pid),
- _____(__NR___pthread_cond_timedwait),
- _____(__NR_aio_fsync),
- _____(__NR_aio_return),
- _____(__NR_aio_suspend),
- _____(__NR_aio_cancel),
- _____(__NR_aio_error),
- _____(__NR_aio_read),
- _____(__NR_aio_write),
- _____(__NR_lio_listio), // 320
- _____(__NR___pthread_cond_wait),
- _____(__NR_iopolicysys),
-// _____(__NR_323),
- _____(__NR_mlockall),
- _____(__NR_munlockall),
-// _____(__NR_326),
+// _____(__NR_gettid),
+// _____(__NR_setsgroups),
+// _____(__NR_getsgroups),
+// _____(__NR_setwgroups),
+// _____(__NR_getwgroups),
+// _____(__NR_mkfifo_extended),
+// _____(__NR_mkdir_extended),
+// _____(__NR_identitysvc),
+// _____(__NR_shared_region_check_np),
+// _____(__NR_shared_region_map_np),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(296)), // old load_shared_file
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(297)), // old reset_shared_file
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(298)), // old new_system_shared_regions
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(299)), // old shared_region_map_file_np
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(300)), // old shared_region_make_private_np
+// _____(__NR___pthread_mutex_destroy),
+// _____(__NR___pthread_mutex_init),
+// _____(__NR___pthread_mutex_lock),
+// _____(__NR___pthread_mutex_trylock),
+// _____(__NR___pthread_mutex_unlock),
+// _____(__NR___pthread_cond_init),
+// _____(__NR___pthread_cond_destroy),
+// _____(__NR___pthread_cond_broadcast),
+// _____(__NR___pthread_cond_signal),
+// _____(__NR_getsid),
+// _____(__NR_settid_with_pid),
+// _____(__NR___pthread_cond_timedwait),
+// _____(__NR_aio_fsync),
+// _____(__NR_aio_return),
+// _____(__NR_aio_suspend),
+// _____(__NR_aio_cancel),
+// _____(__NR_aio_error),
+// _____(__NR_aio_read),
+// _____(__NR_aio_write),
+// _____(__NR_lio_listio), // 320
+// _____(__NR___pthread_cond_wait),
+// _____(__NR_iopolicysys),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(323)), // ???
+// _____(__NR_mlockall),
+// _____(__NR_munlockall),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(326)), // ???
MACX_(__NR_issetugid, sys_issetugid),
- _____(__NR___pthread_kill),
+// _____(__NR___pthread_kill),
MACX_(__NR___pthread_sigmask, sys___pthread_sigmask),
- _____(__NR___sigwait),
+// _____(__NR___sigwait),
MACX_(__NR___disable_threadsignal, sys___disable_threadsignal),
- _____(__NR___pthread_markcancel),
- _____(__NR___pthread_canceled),
+// _____(__NR___pthread_markcancel),
+// _____(__NR___pthread_canceled),
MACX_(__NR___semwait_signal, sys___semwait_signal),
-// _____(__NR_utrace),
- _____(__NR_proc_info),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(335)), // old utrace
+// _____(__NR_proc_info),
MACXY(__NR_sendfile, sys_sendfile),
MACXY(__NR_stat64, sys_stat64),
MACXY(__NR_fstat64, sys_fstat64),
MACXY(__NR_lstat64, sys_lstat64), // 340
- _____(__NR_stat64_extended),
- _____(__NR_lstat64_extended),
- _____(__NR_fstat64_extended),
+// _____(__NR_stat64_extended),
+// _____(__NR_lstat64_extended),
+// _____(__NR_fstat64_extended),
MACXY(__NR_getdirentries64, sys_getdirentries64),
MACXY(__NR_statfs64, sys_statfs64),
MACXY(__NR_fstatfs64, sys_fstatfs64),
- _____(__NR_getfsstat64),
- _____(__NR___pthread_chdir),
- _____(__NR___pthread_fchdir),
- _____(__NR_audit),
+// _____(__NR_getfsstat64),
+// _____(__NR___pthread_chdir),
+// _____(__NR___pthread_fchdir),
+// _____(__NR_audit),
MACXY(__NR_auditon, sys_auditon),
-// _____(__NR_352),
- _____(__NR_getauid),
- _____(__NR_setauid),
- _____(__NR_getaudit),
- _____(__NR_setaudit),
- _____(__NR_getaudit_addr),
- _____(__NR_setaudit_addr),
- _____(__NR_auditctl),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(352)), // ???
+// _____(__NR_getauid),
+// _____(__NR_setauid),
+// _____(__NR_getaudit),
+// _____(__NR_setaudit),
+// _____(__NR_getaudit_addr),
+// _____(__NR_setaudit_addr),
+// _____(__NR_auditctl),
MACXY(__NR_bsdthread_create, sys_bsdthread_create), // 360
MACX_(__NR_bsdthread_terminate, sys_bsdthread_terminate),
MACX_(__NR_kqueue, sys_kqueue),
MACXY(__NR_kevent, sys_kevent),
- _____(__NR_lchown),
- _____(__NR_stack_snapshot),
+// _____(__NR_lchown),
+// _____(__NR_stack_snapshot),
MACX_(__NR_bsdthread_register, sys_bsdthread_register),
MACX_(__NR_workq_open, sys_workq_open),
MACXY(__NR_workq_ops, sys_workq_ops),
-// _____(__NR_369),
-// _____(__NR_370),
-// _____(__NR_371),
-// _____(__NR_372),
-// _____(__NR_373),
-// _____(__NR_374),
-// _____(__NR_375),
-// _____(__NR_376),
-// _____(__NR_377),
-// _____(__NR_378),
-// _____(__NR_379),
- _____(__NR___mac_execve), // 380
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(369)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(370)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(371)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(372)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(373)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(374)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(375)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(376)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(377)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(378)), // ???
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(379)), // ???
+// _____(__NR___mac_execve), // 380
MACX_(__NR___mac_syscall, sys___mac_syscall),
- _____(__NR___mac_get_file),
- _____(__NR___mac_set_file),
- _____(__NR___mac_get_link),
- _____(__NR___mac_set_link),
- _____(__NR___mac_get_proc),
- _____(__NR___mac_set_proc),
- _____(__NR___mac_get_fd),
- _____(__NR___mac_set_fd),
- _____(__NR___mac_get_pid),
- _____(__NR___mac_get_lcid),
- _____(__NR___mac_get_lctx),
- _____(__NR___mac_set_lctx),
- _____(__NR_setlcid),
- _____(__NR_getlcid),
+// _____(__NR___mac_get_file),
+// _____(__NR___mac_set_file),
+// _____(__NR___mac_get_link),
+// _____(__NR___mac_set_link),
+// _____(__NR___mac_get_proc),
+// _____(__NR___mac_set_proc),
+// _____(__NR___mac_get_fd),
+// _____(__NR___mac_set_fd),
+// _____(__NR___mac_get_pid),
+// _____(__NR___mac_get_lcid),
+// _____(__NR___mac_get_lctx),
+// _____(__NR___mac_set_lctx),
+// _____(__NR_setlcid),
+// _____(__NR_getlcid),
// GrP fixme need any special nocancel handling?
GENXY(__NR_read_nocancel, sys_read),
GENX_(__NR_write_nocancel, sys_write),
GENXY(__NR_open_nocancel, sys_open),
GENXY(__NR_close_nocancel, sys_close),
- _____(__NR_wait4_nocancel), // 400
+// _____(__NR_wait4_nocancel), // 400
MACXY(__NR_recvmsg_nocancel, sys_recvmsg),
MACX_(__NR_sendmsg_nocancel, sys_sendmsg),
MACXY(__NR_recvfrom_nocancel, sys_recvfrom),
@@ -6752,24 +6752,24 @@
GENX_(__NR_select_nocancel, sys_select),
GENX_(__NR_fsync_nocancel, sys_fsync),
MACX_(__NR_connect_nocancel, sys_connect),
- _____(__NR_sigsuspend_nocancel),
+// _____(__NR_sigsuspend_nocancel),
GENXY(__NR_readv_nocancel, sys_readv),
GENX_(__NR_writev_nocancel, sys_writev),
MACX_(__NR_sendto_nocancel, sys_sendto),
GENXY(__NR_pread_nocancel, sys_pread64),
GENX_(__NR_pwrite_nocancel, sys_pwrite64),
- _____(__NR_waitid_nocancel),
+// _____(__NR_waitid_nocancel),
GENXY(__NR_poll_nocancel, sys_poll),
- _____(__NR_msgsnd_nocancel),
- _____(__NR_msgrcv_nocancel),
- _____(__NR_sem_wait_nocancel), // 420
- _____(__NR_aio_suspend_nocancel),
- _____(__NR___sigwait_nocancel),
+// _____(__NR_msgsnd_nocancel),
+// _____(__NR_msgrcv_nocancel),
+// _____(__NR_sem_wait_nocancel), // 420
+// _____(__NR_aio_suspend_nocancel),
+// _____(__NR___sigwait_nocancel),
MACX_(__NR___semwait_signal_nocancel, sys___semwait_signal),
- _____(__NR___mac_mount),
- _____(__NR___mac_get_mount),
- _____(__NR___mac_getfsstat),
- _____(__NR_MAXSYSCALL)
+// _____(__NR___mac_mount),
+// _____(__NR___mac_get_mount),
+// _____(__NR___mac_getfsstat),
+// _____(__NR_MAXSYSCALL)
};
@@ -6777,39 +6777,39 @@
// Use ML_(mach_trap_table)[-mach_trap_number] .
const SyscallTableEntry ML_(mach_trap_table)[] = {
-// _____(__NR_0),
-// _____(__NR_1),
-// _____(__NR_2),
-// _____(__NR_3),
-// _____(__NR_4),
-// _____(__NR_5),
-// _____(__NR_6),
-// _____(__NR_7),
-// _____(__NR_8),
-// _____(__NR_9),
-// _____(__NR_10),
-// _____(__NR_11),
-// _____(__NR_12),
-// _____(__NR_13),
-// _____(__NR_14),
-// _____(__NR_15),
-// _____(__NR_16),
-// _____(__NR_17),
-// _____(__NR_18),
-// _____(__NR_19),
-// _____(__NR_20), // -20
-// _____(__NR_21),
-// _____(__NR_22),
-// _____(__NR_23),
-// _____(__NR_24),
-// _____(__NR_25),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(0)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(1)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(2)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(3)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(4)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(5)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(6)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(7)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(8)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(9)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(10)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(11)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(12)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(13)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(14)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(15)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(16)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(17)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(18)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(19)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(20)), // -20
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(21)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(22)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(23)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(24)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(25)),
MACXY(__NR_mach_reply_port, mach_reply_port),
MACXY(__NR_thread_self_trap, mach_thread_self),
MACXY(__NR_task_self_trap, mach_task_self),
MACXY(__NR_host_self_trap, mach_host_self),
-// _____(__NR_30),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(30)),
MACXY(__NR_mach_msg_trap, mach_msg),
- _____(__NR_mach_msg_overwrite_trap),
+// _____(__NR_mach_msg_overwrite_trap),
MACX_(__NR_semaphore_signal_trap, semaphore_signal),
MACX_(__NR_semaphore_signal_all_trap, semaphore_signal_all),
MACX_(__NR_semaphore_signal_thread_trap, semaphore_signal_thread),
@@ -6817,81 +6817,81 @@
MACX_(__NR_semaphore_wait_signal_trap, semaphore_wait_signal),
MACX_(__NR_semaphore_timedwait_trap, semaphore_timedwait),
MACX_(__NR_semaphore_timedwait_signal_trap, semaphore_timedwait_signal),
-// _____(__NR_40), // -40
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(40)), // -40
#if defined(VGA_x86)
- _____(__NR_init_process),
-// _____(__NR_42),
- _____(__NR_map_fd),
+// _____(__NR_init_process),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(42)),
+// _____(__NR_map_fd),
#else
-// _____(__NR_41),
-// _____(__NR_42),
-// _____(__NR_43),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(41)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(42)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(43)),
#endif
- _____(__NR_task_name_for_pid),
+// _____(__NR_task_name_for_pid),
MACXY(__NR_task_for_pid, task_for_pid),
MACXY(__NR_pid_for_task, pid_for_task),
-// _____(__NR_47),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(47)),
#if defined(VGA_x86)
- _____(__NR_macx_swapon),
- _____(__NR_macx_swapoff),
-// _____(__NR_50),
- _____(__NR_macx_triggers),
- _____(__NR_macx_backing_store_suspend),
- _____(__NR_macx_backing_store_recovery),
+// _____(__NR_macx_swapon),
+// _____(__NR_macx_swapoff),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(50)),
+// _____(__NR_macx_triggers),
+// _____(__NR_macx_backing_store_suspend),
+// _____(__NR_macx_backing_store_recovery),
#else
-// _____(__NR_48),
-// _____(__NR_49),
-// _____(__NR_50),
-// _____(__NR_51),
-// _____(__NR_52),
-// _____(__NR_53),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(48)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(49)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(50)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(51)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(52)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(53)),
#endif
-// _____(__NR_54),
-// _____(__NR_55),
-// _____(__NR_56),
-// _____(__NR_57),
-// _____(__NR_58),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(54)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(55)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(56)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(57)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(58)),
MACX_(__NR_swtch_pri, swtch_pri),
MACX_(__NR_swtch, swtch), // -60
MACX_(__NR_syscall_thread_switch, syscall_thread_switch),
- _____(__NR_clock_sleep_trap),
-// _____(__NR_63),
-// _____(__NR_64),
-// _____(__NR_65),
-// _____(__NR_66),
-// _____(__NR_67),
-// _____(__NR_68),
-// _____(__NR_69),
-// _____(__NR_70),
-// _____(__NR_71),
-// _____(__NR_72),
-// _____(__NR_73),
-// _____(__NR_74),
-// _____(__NR_75),
-// _____(__NR_76),
-// _____(__NR_77),
-// _____(__NR_78),
-// _____(__NR_79),
-// _____(__NR_80), // -80
-// _____(__NR_81),
-// _____(__NR_82),
-// _____(__NR_83),
-// _____(__NR_84),
-// _____(__NR_85),
-// _____(__NR_86),
-// _____(__NR_87),
-// _____(__NR_88),
+// _____(__NR_clock_sleep_trap),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(63)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(64)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(65)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(66)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(67)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(68)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(69)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(70)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(71)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(72)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(73)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(74)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(75)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(76)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(77)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(78)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(79)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(80)), // -80
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(81)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(82)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(83)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(84)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(85)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(86)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(87)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(88)),
MACXY(__NR_mach_timebase_info, mach_timebase_info),
MACX_(__NR_mach_wait_until, mach_wait_until),
MACXY(__NR_mk_timer_create, mk_timer_create),
MACXY(__NR_mk_timer_destroy, mk_timer_destroy),
MACX_(__NR_mk_timer_arm, mk_timer_arm),
MACXY(__NR_mk_timer_cancel, mk_timer_cancel),
-// _____(__NR_95),
-// _____(__NR_96),
-// _____(__NR_97),
-// _____(__NR_98),
-// _____(__NR_99),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(95)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(96)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(97)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(98)),
+ _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(99)),
MACXY(__NR_iokit_user_client_trap, iokit_user_client_trap), // -100
};
Modified: branches/DARWIN/coregrind/m_syswrap/syswrap-main.c
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/syswrap-main.c 2009-02-16 05:52:11 UTC (rev 9179)
+++ branches/DARWIN/coregrind/m_syswrap/syswrap-main.c 2009-02-16 07:10:42 UTC (rev 9180)
@@ -1187,20 +1187,20 @@
switch (VG_DARWIN_SYSNO_CLASS(syscallno)) {
case VG_DARWIN_SYSCALL_CLASS_UX64:
case VG_DARWIN_SYSCALL_CLASS_UNIX:
- if (idx >= 0 && idx < ML_(syscall_table_size)) {
+ if (idx >= 0 && idx < ML_(syscall_table_size) &&
+ ML_(syscall_table)[idx].before != NULL)
sys = &ML_(syscall_table)[idx];
- }
- break;
+ break;
case VG_DARWIN_SYSCALL_CLASS_MACH:
- if (idx >= 0 && idx < ML_(mach_trap_table_size)) {
+ if (idx >= 0 && idx < ML_(mach_trap_table_size) &&
+ ML_(mach_trap_table)[idx].before != NULL)
sys = &ML_(mach_trap_table)[idx];
- }
- break;
+ break;
case VG_DARWIN_SYSCALL_CLASS_MDEP:
- if (idx >= 0 && idx < ML_(mdep_trap_table_size)) {
+ if (idx >= 0 && idx < ML_(mdep_trap_table_size) &&
+ ML_(mdep_trap_table)[idx].before != NULL)
sys = &ML_(mdep_trap_table)[idx];
- }
- break;
+ break;
default:
vg_assert(0);
break;
Modified: branches/DARWIN/include/vki/vki-scnums-darwin.h
===================================================================
--- branches/DARWIN/include/vki/vki-scnums-darwin.h 2009-02-16 05:52:11 UTC (rev 9179)
+++ branches/DARWIN/include/vki/vki-scnums-darwin.h 2009-02-16 07:10:42 UTC (rev 9180)
@@ -294,7 +294,6 @@
#define __NR_adjtime VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(140)
/* 141 old getpeername */
#define __NR_gethostuuid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(142)
- /* 142 old gethostid */
/* 143 old sethostid */
/* 144 old getrlimit */
/* 145 old setrlimit */
|