|
From: <sv...@va...> - 2009-05-18 05:02:14
|
Author: njn
Date: 2009-05-18 06:02:08 +0100 (Mon, 18 May 2009)
New Revision: 9887
Log:
Merge most of r9061 (ptrcheck tweaks) from the trunk.
Modified:
branches/DARWIN/exp-ptrcheck/h_main.c
branches/DARWIN/exp-ptrcheck/pc_common.c
Modified: branches/DARWIN/exp-ptrcheck/h_main.c
===================================================================
--- branches/DARWIN/exp-ptrcheck/h_main.c 2009-05-18 04:56:42 UTC (rev 9886)
+++ branches/DARWIN/exp-ptrcheck/h_main.c 2009-05-18 05:02:08 UTC (rev 9887)
@@ -2210,6 +2210,7 @@
ADD(0, __NR_fcntl64);
# endif
ADD(0, __NR_fdatasync);
+ ADD(0, __NR_flock);
ADD(0, __NR_fstat);
# if defined(__NR_fstat64)
ADD(0, __NR_fstat64);
@@ -2266,6 +2267,7 @@
ADD(0, __NR_inotify_init);
ADD(0, __NR_inotify_rm_watch);
ADD(0, __NR_ioctl); // ioctl -- assuming no pointers returned
+ ADD(0, __NR_ioprio_get);
ADD(0, __NR_kill);
ADD(0, __NR_link);
# if defined(__NR_listen)
@@ -2278,6 +2280,7 @@
# endif
ADD(0, __NR_madvise);
ADD(0, __NR_mkdir);
+ ADD(0, __NR_mlock);
ADD(0, __NR_mprotect);
ADD(0, __NR_munmap); // die_mem_munmap already called, segment remove);
ADD(0, __NR_nanosleep);
@@ -2308,6 +2311,15 @@
ADD(0, __NR_sched_setscheduler);
ADD(0, __NR_sched_yield);
ADD(0, __NR_select);
+# if defined(__NR_semctl)
+ ADD(0, __NR_semctl);
+# endif
+# if defined(__NR_semget)
+ ADD(0, __NR_semget);
+# endif
+# if defined(__NR_semop)
+ ADD(0, __NR_semop);
+# endif
# if defined(__NR_sendto)
ADD(0, __NR_sendto);
# endif
Modified: branches/DARWIN/exp-ptrcheck/pc_common.c
===================================================================
--- branches/DARWIN/exp-ptrcheck/pc_common.c 2009-05-18 04:56:42 UTC (rev 9886)
+++ branches/DARWIN/exp-ptrcheck/pc_common.c 2009-05-18 05:02:08 UTC (rev 9887)
@@ -397,7 +397,7 @@
VG_(pp_ExeContext)( VG_(get_error_where)(err) );
VG_(message)(Vg_UserMsg, " Address %#lx is %ld bytes inside a "
- "%ld-byte block alloc'd",
+ "%ld-byte block free'd",
lo, lo-Seg__addr(seglo),
Seg__size(seglo) );
VG_(pp_ExeContext)(Seg__where(seglo));
|