You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(122) |
Nov
(152) |
Dec
(69) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(6) |
Feb
(25) |
Mar
(73) |
Apr
(82) |
May
(24) |
Jun
(25) |
Jul
(10) |
Aug
(11) |
Sep
(10) |
Oct
(54) |
Nov
(203) |
Dec
(182) |
| 2004 |
Jan
(307) |
Feb
(305) |
Mar
(430) |
Apr
(312) |
May
(187) |
Jun
(342) |
Jul
(487) |
Aug
(637) |
Sep
(336) |
Oct
(373) |
Nov
(441) |
Dec
(210) |
| 2005 |
Jan
(385) |
Feb
(480) |
Mar
(636) |
Apr
(544) |
May
(679) |
Jun
(625) |
Jul
(810) |
Aug
(838) |
Sep
(634) |
Oct
(521) |
Nov
(965) |
Dec
(543) |
| 2006 |
Jan
(494) |
Feb
(431) |
Mar
(546) |
Apr
(411) |
May
(406) |
Jun
(322) |
Jul
(256) |
Aug
(401) |
Sep
(345) |
Oct
(542) |
Nov
(308) |
Dec
(481) |
| 2007 |
Jan
(427) |
Feb
(326) |
Mar
(367) |
Apr
(255) |
May
(244) |
Jun
(204) |
Jul
(223) |
Aug
(231) |
Sep
(354) |
Oct
(374) |
Nov
(497) |
Dec
(362) |
| 2008 |
Jan
(322) |
Feb
(482) |
Mar
(658) |
Apr
(422) |
May
(476) |
Jun
(396) |
Jul
(455) |
Aug
(267) |
Sep
(280) |
Oct
(253) |
Nov
(232) |
Dec
(304) |
| 2009 |
Jan
(486) |
Feb
(470) |
Mar
(458) |
Apr
(423) |
May
(696) |
Jun
(461) |
Jul
(551) |
Aug
(575) |
Sep
(134) |
Oct
(110) |
Nov
(157) |
Dec
(102) |
| 2010 |
Jan
(226) |
Feb
(86) |
Mar
(147) |
Apr
(117) |
May
(107) |
Jun
(203) |
Jul
(193) |
Aug
(238) |
Sep
(300) |
Oct
(246) |
Nov
(23) |
Dec
(75) |
| 2011 |
Jan
(133) |
Feb
(195) |
Mar
(315) |
Apr
(200) |
May
(267) |
Jun
(293) |
Jul
(353) |
Aug
(237) |
Sep
(278) |
Oct
(611) |
Nov
(274) |
Dec
(260) |
| 2012 |
Jan
(303) |
Feb
(391) |
Mar
(417) |
Apr
(441) |
May
(488) |
Jun
(655) |
Jul
(590) |
Aug
(610) |
Sep
(526) |
Oct
(478) |
Nov
(359) |
Dec
(372) |
| 2013 |
Jan
(467) |
Feb
(226) |
Mar
(391) |
Apr
(281) |
May
(299) |
Jun
(252) |
Jul
(311) |
Aug
(352) |
Sep
(481) |
Oct
(571) |
Nov
(222) |
Dec
(231) |
| 2014 |
Jan
(185) |
Feb
(329) |
Mar
(245) |
Apr
(238) |
May
(281) |
Jun
(399) |
Jul
(382) |
Aug
(500) |
Sep
(579) |
Oct
(435) |
Nov
(487) |
Dec
(256) |
| 2015 |
Jan
(338) |
Feb
(357) |
Mar
(330) |
Apr
(294) |
May
(191) |
Jun
(108) |
Jul
(142) |
Aug
(261) |
Sep
(190) |
Oct
(54) |
Nov
(83) |
Dec
(22) |
| 2016 |
Jan
(49) |
Feb
(89) |
Mar
(33) |
Apr
(50) |
May
(27) |
Jun
(34) |
Jul
(53) |
Aug
(53) |
Sep
(98) |
Oct
(206) |
Nov
(93) |
Dec
(53) |
| 2017 |
Jan
(65) |
Feb
(82) |
Mar
(102) |
Apr
(86) |
May
(187) |
Jun
(67) |
Jul
(23) |
Aug
(93) |
Sep
(65) |
Oct
(45) |
Nov
(35) |
Dec
(17) |
| 2018 |
Jan
(26) |
Feb
(35) |
Mar
(38) |
Apr
(32) |
May
(8) |
Jun
(43) |
Jul
(27) |
Aug
(30) |
Sep
(43) |
Oct
(42) |
Nov
(38) |
Dec
(67) |
| 2019 |
Jan
(32) |
Feb
(37) |
Mar
(53) |
Apr
(64) |
May
(49) |
Jun
(18) |
Jul
(14) |
Aug
(53) |
Sep
(25) |
Oct
(30) |
Nov
(49) |
Dec
(31) |
| 2020 |
Jan
(87) |
Feb
(45) |
Mar
(37) |
Apr
(51) |
May
(99) |
Jun
(36) |
Jul
(11) |
Aug
(14) |
Sep
(20) |
Oct
(24) |
Nov
(40) |
Dec
(23) |
| 2021 |
Jan
(14) |
Feb
(53) |
Mar
(85) |
Apr
(15) |
May
(19) |
Jun
(3) |
Jul
(14) |
Aug
(1) |
Sep
(57) |
Oct
(73) |
Nov
(56) |
Dec
(22) |
| 2022 |
Jan
(3) |
Feb
(22) |
Mar
(6) |
Apr
(55) |
May
(46) |
Jun
(39) |
Jul
(15) |
Aug
(9) |
Sep
(11) |
Oct
(34) |
Nov
(20) |
Dec
(36) |
| 2023 |
Jan
(79) |
Feb
(41) |
Mar
(99) |
Apr
(169) |
May
(48) |
Jun
(16) |
Jul
(16) |
Aug
(57) |
Sep
(19) |
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
1
(5) |
2
(15) |
3
(20) |
|
4
(4) |
5
(11) |
6
(8) |
7
(36) |
8
(23) |
9
(6) |
10
(4) |
|
11
(4) |
12
(19) |
13
(17) |
14
(33) |
15
(16) |
16
(17) |
17
(4) |
|
18
(4) |
19
(30) |
20
(22) |
21
(23) |
22
(29) |
23
(20) |
24
(12) |
|
25
(7) |
26
(33) |
27
(10) |
28
(12) |
29
(19) |
30
(15) |
31
(8) |
|
From: <sv...@va...> - 2009-01-09 19:01:14
|
Author: bart
Date: 2009-01-09 19:01:04 +0000 (Fri, 09 Jan 2009)
New Revision: 8931
Log:
Removed _IO_flockfile and _IO_funlockfile intercepts again: both functions are inline and hence can't be intercepted.
Removed:
branches/DRDDEV/drd/drd_libc_intercepts.c
Modified:
branches/DRDDEV/drd/Makefile.am
Modified: branches/DRDDEV/drd/Makefile.am
===================================================================
--- branches/DRDDEV/drd/Makefile.am 2009-01-09 16:42:51 UTC (rev 8930)
+++ branches/DRDDEV/drd/Makefile.am 2009-01-09 19:01:04 UTC (rev 8931)
@@ -23,7 +23,6 @@
VGPRELOAD_DRD_SOURCES = \
drd_gomp_intercepts.c \
- drd_libc_intercepts.c \
drd_pthread_intercepts.c \
drd_qtcore_intercepts.c \
drd_strmem_intercepts.c
Deleted: branches/DRDDEV/drd/drd_libc_intercepts.c
===================================================================
--- branches/DRDDEV/drd/drd_libc_intercepts.c 2009-01-09 16:42:51 UTC (rev 8930)
+++ branches/DRDDEV/drd/drd_libc_intercepts.c 2009-01-09 19:01:04 UTC (rev 8931)
@@ -1,91 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Replacements for functions operating on FILE objects, which ---*/
-/*--- run on the simulated CPU ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of DRD, a heavyweight Valgrind tool for
- detecting threading errors.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-*/
-
-#include <stdio.h>
-#include "pub_tool_basics.h"
-#include "pub_tool_redir.h"
-#include "valgrind.h"
-#include "drd_clientreq.h"
-
-
-/* --------- Some handy Z-encoded names. --------- */
-
-/* --- Soname of the standard C library. --- */
-
-#if defined(VGO_linux)
-# define m_libc_soname libcZdsoZa // libc.so*
-#elif defined(VGP_ppc32_aix5)
- /* AIX has both /usr/lib/libc.a and /usr/lib/libc_r.a. */
-# define m_libc_soname libcZaZdaZLshrZdoZR // libc*.a(shr.o)
-#elif defined(VGP_ppc64_aix5)
-# define m_libc_soname libcZaZdaZLshrZu64ZdoZR // libc*.a(shr_64.o)
-#else
-# error "Unknown platform"
-#endif
-
-#define LIBC_FUNC(ret_ty, f, args...) \
- ret_ty VG_WRAP_FUNCTION_ZZ(m_libc_soname, f)(args); \
- ret_ty VG_WRAP_FUNCTION_ZZ(m_libc_soname, f)(args)
-
-LIBC_FUNC(int, ZuIOZuflockfile, // _IO_flockfile
- FILE * stream)
-{
- int ret;
- int res;
- OrigFn fn;
-
- VALGRIND_GET_ORIG_FN(fn);
- VALGRIND_DO_CLIENT_REQUEST(res, 0, VG_USERREQ__PRE_MUTEX_LOCK,
- stream, mutex_type_libio_file, 0, 0, 0);
- CALL_FN_W_W(ret, fn, stream);
- VALGRIND_DO_CLIENT_REQUEST(res, 0, VG_USERREQ__POST_MUTEX_LOCK,
- stream, True, 0, 0, 0);
- return ret;
-}
-
-LIBC_FUNC(int, ZuIOZufunlockfile, // _IO_funlockfile
- FILE *stream)
-{
- int ret;
- int res;
- OrigFn fn;
-
- VALGRIND_GET_ORIG_FN(fn);
- VALGRIND_DO_CLIENT_REQUEST(res, -1,
- VG_USERREQ__PRE_MUTEX_UNLOCK,
- stream, mutex_type_libio_file, 0, 0, 0);
- CALL_FN_W_W(ret, fn, stream);
- VALGRIND_DO_CLIENT_REQUEST(res, -1,
- VG_USERREQ__POST_MUTEX_UNLOCK,
- stream, 0, 0, 0, 0);
- return ret;
-}
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
|
|
From: Peter O. <kum...@ar...> - 2009-01-09 17:44:37
|
Hi, I use VALGRIND_CHECK_MEM_IS_DEFINED request to check if all data in a structure is initialized before putting the data into a list. When such a structure is allocated on stack the error message is pretty meaningless since it only tells the address of the element on the stack. Much more useful would be where the memory was uninitialized relative to the start address of the VALGRIND_CHECK_MEM_IS_DEFINED request. So i hacked together this quick patch. I would guess it is not ready for inclusion as is stands now. But it might be useful for somebody. In the attached sample output is easy to see that the first unitialized byte is a offset 4. Now we can go hunt which stucture member resides at that offset (use pahole or look at the source) Another possibility for this would be a custom macro that wraps around VALGRIND_CHECK_MEM_IS_DEFINED but this has the disadvantage that the each project needs it's own print function and it is possibly separated from the valgrind output. Greetings Peter |
|
From: <sv...@va...> - 2009-01-09 16:43:02
|
Author: tom
Date: 2009-01-09 16:42:51 +0000 (Fri, 09 Jan 2009)
New Revision: 8930
Log:
Add signalfd4 support.
Modified:
trunk/coregrind/m_syswrap/priv_syswrap-linux.h
trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c
trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c
trunk/coregrind/m_syswrap/syswrap-x86-linux.c
Modified: trunk/coregrind/m_syswrap/priv_syswrap-linux.h
===================================================================
--- trunk/coregrind/m_syswrap/priv_syswrap-linux.h 2009-01-09 02:46:10 UTC (rev 8929)
+++ trunk/coregrind/m_syswrap/priv_syswrap-linux.h 2009-01-09 16:42:51 UTC (rev 8930)
@@ -133,6 +133,7 @@
DECL_TEMPLATE(linux, sys_timerfd_settime);
DECL_TEMPLATE(linux, sys_signalfd);
+DECL_TEMPLATE(linux, sys_signalfd4);
DECL_TEMPLATE(linux, sys_capget);
DECL_TEMPLATE(linux, sys_capset);
Modified: trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2009-01-09 02:46:10 UTC (rev 8929)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2009-01-09 16:42:51 UTC (rev 8930)
@@ -1361,7 +1361,7 @@
LINXY(__NR_timerfd_settime, sys_timerfd_settime), // 286
LINXY(__NR_timerfd_gettime, sys_timerfd_gettime), // 287
// (__NR_paccept, sys_ni_syscall) // 288
- // (__NR_signalfd4, sys_ni_syscall) // 289
+ LINXY(__NR_signalfd4, sys_signalfd4), // 289
LINX_(__NR_eventfd2, sys_eventfd2), // 290
// (__NR_epoll_create1, sys_ni_syscall) // 291
Modified: trunk/coregrind/m_syswrap/syswrap-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-linux.c 2009-01-09 02:46:10 UTC (rev 8929)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c 2009-01-09 16:42:51 UTC (rev 8930)
@@ -2431,7 +2431,7 @@
PRE(sys_signalfd)
{
- PRINT("sys_signalfd ( %d, %#lx, %llu )", (Int)ARG1, ARG2, (ULong) ARG3);
+ PRINT("sys_signalfd ( %d, %#lx, %llu )", (Int)ARG1,ARG2,(ULong)ARG3);
PRE_REG_READ3(long, "sys_signalfd",
int, fd, vki_sigset_t *, sigmask, vki_size_t, sigsetsize);
PRE_MEM_READ( "signalfd(sigmask)", ARG2, sizeof(vki_sigset_t) );
@@ -2449,7 +2449,27 @@
}
}
+PRE(sys_signalfd4)
+{
+ PRINT("sys_signalfd4 ( %d, %#lx, %llu, %ld )", (Int)ARG1,ARG2,(ULong)ARG3,ARG4);
+ PRE_REG_READ4(long, "sys_signalfd4",
+ int, fd, vki_sigset_t *, sigmask, vki_size_t, sigsetsize, int, flags);
+ PRE_MEM_READ( "signalfd(sigmask)", ARG2, sizeof(vki_sigset_t) );
+ if ((int)ARG1 != -1 && !ML_(fd_allowed)(ARG1, "signalfd", tid, False))
+ SET_STATUS_Failure( VKI_EBADF );
+}
+POST(sys_signalfd4)
+{
+ if (!ML_(fd_allowed)(RES, "signalfd4", tid, True)) {
+ VG_(close)(RES);
+ SET_STATUS_Failure( VKI_EMFILE );
+ } else {
+ if (VG_(clo_track_fds))
+ ML_(record_fd_open_nameless) (tid, RES);
+ }
+}
+
/* ---------------------------------------------------------------------
rt_sig* wrappers
------------------------------------------------------------------ */
Modified: trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c 2009-01-09 02:46:10 UTC (rev 8929)
+++ trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c 2009-01-09 16:42:51 UTC (rev 8930)
@@ -1859,7 +1859,7 @@
// LINXY(__NR_subpage_prot, sys_ni_syscall), // 310
LINXY(__NR_timerfd_settime, sys_timerfd_settime), // 311
LINXY(__NR_timerfd_gettime, sys_timerfd_gettime), // 312
- // (__NR_signalfd4, sys_ni_syscall) // 313
+ LINXY(__NR_signalfd4, sys_signalfd4), // 313
LINX_(__NR_eventfd2, sys_eventfd2), // 314
// (__NR_epoll_create1, sys_ni_syscall) // 315
// (__NR_dup3, sys_ni_syscall) // 316
Modified: trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c 2009-01-09 02:46:10 UTC (rev 8929)
+++ trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c 2009-01-09 16:42:51 UTC (rev 8930)
@@ -1499,7 +1499,7 @@
// LINXY(__NR_subpage_prot, sys_ni_syscall), // 310
LINXY(__NR_timerfd_settime, sys_timerfd_settime), // 311
LINXY(__NR_timerfd_gettime, sys_timerfd_gettime), // 312
- // (__NR_signalfd4, sys_ni_syscall) // 313
+ LINXY(__NR_signalfd4, sys_signalfd4), // 313
LINX_(__NR_eventfd2, sys_eventfd2), // 314
// (__NR_epoll_create1, sys_ni_syscall) // 315
// (__NR_dup3, sys_ni_syscall) // 316
Modified: trunk/coregrind/m_syswrap/syswrap-x86-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-x86-linux.c 2009-01-09 02:46:10 UTC (rev 8929)
+++ trunk/coregrind/m_syswrap/syswrap-x86-linux.c 2009-01-09 16:42:51 UTC (rev 8930)
@@ -2234,7 +2234,7 @@
LINXY(__NR_timerfd_settime, sys_timerfd_settime), // 325
LINXY(__NR_timerfd_gettime, sys_timerfd_gettime), // 326
- // (__NR_signalfd4, sys_ni_syscall) // 327
+ LINXY(__NR_signalfd4, sys_signalfd4), // 327
LINX_(__NR_eventfd2, sys_eventfd2), // 328
// (__NR_epoll_create1, sys_ni_syscall) // 329
|
|
From: Tom H. <th...@cy...> - 2009-01-09 15:44:42
|
Nightly build on vauxhall ( x86_64, Fedora 10 ) started at 2009-01-09 15:15:54 GMT Results differ from 24 hours ago Checking out valgrind source tree ... done Configuring valgrind ... done Building valgrind ... done Running regression tests ... failed Regression test results follow == 481 tests, 6 stderr failures, 0 stdout failures, 0 post failures == exp-ptrcheck/tests/base (stderr) exp-ptrcheck/tests/preen_invars (stderr) helgrind/tests/hg05_race2 (stderr) memcheck/tests/linux-syscalls-2007 (stderr) memcheck/tests/x86/scalar (stderr) none/tests/blockfault (stderr) ================================================= == Results from 24 hours ago == ================================================= Checking out valgrind source tree ... done Configuring valgrind ... done Building valgrind ... done Running regression tests ... failed Regression test results follow == 481 tests, 5 stderr failures, 0 stdout failures, 0 post failures == exp-ptrcheck/tests/base (stderr) exp-ptrcheck/tests/preen_invars (stderr) memcheck/tests/linux-syscalls-2007 (stderr) memcheck/tests/x86/scalar (stderr) none/tests/blockfault (stderr) ================================================= == Difference between 24 hours ago and now == ================================================= *** old.short 2009-01-09 15:30:13.000000000 +0000 --- new.short 2009-01-09 15:44:32.000000000 +0000 *************** *** 8,12 **** ! == 481 tests, 5 stderr failures, 0 stdout failures, 0 post failures == exp-ptrcheck/tests/base (stderr) exp-ptrcheck/tests/preen_invars (stderr) memcheck/tests/linux-syscalls-2007 (stderr) --- 8,13 ---- ! == 481 tests, 6 stderr failures, 0 stdout failures, 0 post failures == exp-ptrcheck/tests/base (stderr) exp-ptrcheck/tests/preen_invars (stderr) + helgrind/tests/hg05_race2 (stderr) memcheck/tests/linux-syscalls-2007 (stderr) |
|
From: <sv...@va...> - 2009-01-09 02:46:18
|
Author: njn
Date: 2009-01-09 02:46:10 +0000 (Fri, 09 Jan 2009)
New Revision: 8929
Log:
This commit changes some things in a way that will make it easier to get
this branch compiling on Linux.
DARWIN/include/vki/vki-scnums-darwin.h
- Capitalise and prepend with "VG_DARWIN_" all macros exported from this
file, to make it clear that they are (a) macros, and (b)
Darwin-specific.
- Moved some of the macros elsewhere.
DARWIN/include/pub_tool_vkiscnums.h
- Don't bother allowing this to be included in assembly code files.
- Move the macros for printing Darwin syscall numbers here, to match
VG_(aix5_sysno_to_sysname). (They should be merged in a generic
fashion eventually.)
DARWIN/coregrind/pub_core_vkiscnums.h
- Move other Darwin macros from vki-scnums-darwin.h, because this feels
like a better place for them.
DARWIN/coregrind/m_syswrap/syswrap-generic.c
- Avoid using a Darwin-only macro on other platforms.
DARWIN/coregrind/m_syswrap/syswrap-main.c
DARWIN/coregrind/m_syswrap/syswrap-darwin.c
DARWIN/coregrind/m_debuglog.c
- Update macro names.
DARWIN/coregrind/m_syswrap/priv_types_n_macros.h
- Update macro names.
- Undef a local macro once it's finished with.
DARWIN/coregrind/m_syscall.c
- Avoid a warning about unused functions.
- Update macro names.
DARWIN/exp-ptrcheck/h_main.c
- Handle Darwin syscall numbers in a message.
Modified:
branches/DARWIN/coregrind/m_debuglog.c
branches/DARWIN/coregrind/m_syscall.c
branches/DARWIN/coregrind/m_syswrap/priv_types_n_macros.h
branches/DARWIN/coregrind/m_syswrap/syswrap-darwin.c
branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c
branches/DARWIN/coregrind/m_syswrap/syswrap-main.c
branches/DARWIN/coregrind/pub_core_vkiscnums.h
branches/DARWIN/exp-ptrcheck/h_main.c
branches/DARWIN/include/pub_tool_vkiscnums.h
branches/DARWIN/include/vki/vki-scnums-darwin.h
Modified: branches/DARWIN/coregrind/m_debuglog.c
===================================================================
--- branches/DARWIN/coregrind/m_debuglog.c 2009-01-09 01:07:02 UTC (rev 8928)
+++ branches/DARWIN/coregrind/m_debuglog.c 2009-01-09 02:46:10 UTC (rev 8929)
@@ -444,7 +444,7 @@
"movq $1, %%rdi\n" /* push stderr */
"movq %1, %%rsi\n" /* push buf */
"movl %2, %%edx\n" /* push n */
- "movl $" VG_STRINGIFY(sysno_num(__NR_write)) ", %%eax\n"
+ "movl $" VG_STRINGIFY(VG_DARWIN_SYSNO_NUM(__NR_write)) ", %%eax\n"
"syscall\n" /* write(stderr, buf, n) */
"jnc 1f\n" /* jump if no error */
"movq $-1, %%rax\n" /* return -1 if error */
@@ -460,7 +460,7 @@
{
UInt __res;
__asm__ volatile (
- "movl $" VG_STRINGIFY(sysno_num(__NR_getpid)) ", %%eax\n"
+ "movl $" VG_STRINGIFY(VG_DARWIN_SYSNO_NUM(__NR_getpid)) ", %%eax\n"
"syscall\n" /* getpid() */
"movl %%eax, %0\n" /* set __res = eax */
: "=mr" (__res)
Modified: branches/DARWIN/coregrind/m_syscall.c
===================================================================
--- branches/DARWIN/coregrind/m_syscall.c 2009-01-09 01:07:02 UTC (rev 8928)
+++ branches/DARWIN/coregrind/m_syscall.c 2009-01-09 02:46:10 UTC (rev 8929)
@@ -144,7 +144,8 @@
Some syscalls return a double-word result. On 32-bit architectures
this is encoded in a single ULong. */
-SysRes VG_(mk_SysRes_32_darwin) ( ULong val, UInt errflag ) {
+#if defined(VGA_x86)
+static SysRes mk_SysRes_32_darwin ( ULong val, UInt errflag ) {
SysRes res;
res.isError = errflag != 0;
if (res.isError) {
@@ -159,7 +160,8 @@
return res;
}
-SysRes VG_(mk_SysRes_64_darwin) ( UWord val, UWord val2, UWord errflag ) {
+#elif defined(VGA_amd64)
+static SysRes mk_SysRes_64_darwin ( UWord val, UWord val2, UWord errflag ) {
SysRes res;
res.isError = errflag != 0;
if (res.isError) {
@@ -174,8 +176,12 @@
return res;
}
+#else
+# error Unknown arch
#endif
+#endif
+
/* Generic constructors. */
SysRes VG_(mk_SysRes_Error) ( UWord err ) {
SysRes r;
@@ -712,24 +718,24 @@
#elif defined(VGP_x86_darwin)
UWord err;
ULong val;
- switch (sysno_class(sysno)) {
- case SYSCALL_CLASS_UNIX:
+ switch (VG_DARWIN_SYSNO_CLASS(sysno)) {
+ case VG_DARWIN_SYSCALL_CLASS_UNIX:
val = do_syscall_unix_WRK(a1,a2,a3,a4,a5,a6,a7,a8,
- sysno_num(sysno), &err);
+ VG_DARWIN_SYSNO_NUM(sysno), &err);
val &= ~(Addr)0;
break;
- case SYSCALL_CLASS_UX64:
+ case VG_DARWIN_SYSCALL_CLASS_UX64:
val = do_syscall_unix_WRK(a1,a2,a3,a4,a5,a6,a7,a8,
- sysno_num(sysno), &err);
+ VG_DARWIN_SYSNO_NUM(sysno), &err);
break;
- case SYSCALL_CLASS_MACH:
+ case VG_DARWIN_SYSCALL_CLASS_MACH:
val = do_syscall_mach_WRK(a1,a2,a3,a4,a5,a6,a7,a8,
- sysno_num(sysno));
+ VG_DARWIN_SYSNO_NUM(sysno));
err = 0;
break;
- case SYSCALL_CLASS_MDEP:
+ case VG_DARWIN_SYSCALL_CLASS_MDEP:
val = do_syscall_mdep_WRK(a1,a2,a3,a4,a5,a6,a7,a8,
- sysno_num(sysno));
+ VG_DARWIN_SYSNO_NUM(sysno));
err = 0;
break;
default:
@@ -737,21 +743,21 @@
break;
}
- return VG_(mk_SysRes_32_darwin)( val, err );
+ return mk_SysRes_32_darwin( val, err );
#elif defined(VGP_amd64_darwin)
UWord err;
UWord val, val2;
- switch (sysno_class(sysno)) {
- case SYSCALL_CLASS_UNIX:
- case SYSCALL_CLASS_UX64:
+ switch (VG_DARWIN_SYSNO_CLASS(sysno)) {
+ case VG_DARWIN_SYSCALL_CLASS_UNIX:
+ case VG_DARWIN_SYSCALL_CLASS_UX64:
val = do_syscall_unix_WRK(a1,a2,a3,a4,a5,a6,a7,a8,
- sysno_num(sysno), &err, &val2);
+ VG_DARWIN_SYSNO_NUM(sysno), &err, &val2);
break;
- case SYSCALL_CLASS_MACH:
- case SYSCALL_CLASS_MDEP:
+ case VG_DARWIN_SYSCALL_CLASS_MACH:
+ case VG_DARWIN_SYSCALL_CLASS_MDEP:
val = do_syscall_mach_WRK(a1,a2,a3,a4,a5,a6,a7,a8,
- sysno_num(sysno));
+ VG_DARWIN_SYSNO_NUM(sysno));
err = 0;
break;
default:
@@ -759,7 +765,7 @@
break;
}
- return VG_(mk_SysRes_64_darwin)( val, val2, err );
+ return mk_SysRes_64_darwin( val, val2, err );
#else
# error Unknown platform
Modified: branches/DARWIN/coregrind/m_syswrap/priv_types_n_macros.h
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/priv_types_n_macros.h 2009-01-09 01:07:02 UTC (rev 8928)
+++ branches/DARWIN/coregrind/m_syswrap/priv_types_n_macros.h 2009-01-09 02:46:10 UTC (rev 8929)
@@ -256,8 +256,8 @@
/* Add a generic wrapper to a syscall table. */
#if defined(VGO_darwin)
-#define GENX_(sysno, name) WRAPPER_ENTRY_X_(generic, sysno_index(sysno), name)
-#define GENXY(sysno, name) WRAPPER_ENTRY_XY(generic, sysno_index(sysno), name)
+#define GENX_(sysno, name) WRAPPER_ENTRY_X_(generic, VG_DARWIN_SYSNO_INDEX(sysno), name)
+#define GENXY(sysno, name) WRAPPER_ENTRY_XY(generic, VG_DARWIN_SYSNO_INDEX(sysno), name)
#else
#define GENX_(sysno, name) WRAPPER_ENTRY_X_(generic, sysno, name)
#define GENXY(sysno, name) WRAPPER_ENTRY_XY(generic, sysno, name)
@@ -515,6 +515,8 @@
# error unknown SYSCALL_PARAMS_IN_REGISTERS value
#endif
+#undef SYSCALL_PARAMS_IN_REGISTERS
+
#define PRE_REG_READ0(tr, s) \
if (VG_(tdict).track_pre_reg_read) { \
PRRSN; \
Modified: branches/DARWIN/coregrind/m_syswrap/syswrap-darwin.c
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/syswrap-darwin.c 2009-01-09 01:07:02 UTC (rev 8928)
+++ branches/DARWIN/coregrind/m_syswrap/syswrap-darwin.c 2009-01-09 02:46:10 UTC (rev 8929)
@@ -424,8 +424,6 @@
while(i) {
if(i->port == port) {
- int r;
-
vg_assert(right != MACH_PORT_TYPE_DEAD_NAME);
if (right & MACH_PORT_TYPE_SEND) {
// send rights are refcounted
@@ -5985,10 +5983,9 @@
syscall tables
------------------------------------------------------------------ */
-/* Add a Darwin-specific, arch-independent wrapper to a syscall
- table. */
-#define MACX_(sysno, name) WRAPPER_ENTRY_X_(darwin, sysno_index(sysno), name)
-#define MACXY(sysno, name) WRAPPER_ENTRY_XY(darwin, sysno_index(sysno), name)
+/* Add a Darwin-specific, arch-independent wrapper to a syscall table. */
+#define MACX_(sysno, name) WRAPPER_ENTRY_X_(darwin, VG_DARWIN_SYSNO_INDEX(sysno), name)
+#define MACXY(sysno, name) WRAPPER_ENTRY_XY(darwin, VG_DARWIN_SYSNO_INDEX(sysno), name)
#define _____(sysno) GENX_(sysno, sys_ni_syscall)
/*
Modified: branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c 2009-01-09 01:07:02 UTC (rev 8928)
+++ branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c 2009-01-09 02:46:10 UTC (rev 8929)
@@ -2148,7 +2148,15 @@
PRE(sys_ni_syscall)
{
- VG_(printf)("UNKNOWN syscall %d! (ni_syscall)\n", sysno_print(SYSNO));
+ VG_(printf)("UNKNOWN syscall %d! (ni_syscall)\n",
+#if defined(VGO_linux) || defined(VGO_aix5)
+ SYSNO
+#elif defined(VGO_darwin)
+ VG_DARWIN_SYSNO_PRINT(SYSNO)
+#else
+# error Unknown OS
+#endif
+ );
PRE_REG_READ0(long, "ni_syscall");
SET_STATUS_Failure( VKI_ENOSYS );
}
Modified: branches/DARWIN/coregrind/m_syswrap/syswrap-main.c
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/syswrap-main.c 2009-01-09 01:07:02 UTC (rev 8928)
+++ branches/DARWIN/coregrind/m_syswrap/syswrap-main.c 2009-01-09 02:46:10 UTC (rev 8929)
@@ -319,22 +319,22 @@
const vki_sigset_t *restore_mask,
Word nsigwords)
{
- switch (sysno_class(syscallno)) {
- case SYSCALL_CLASS_UNIX:
+ switch (VG_DARWIN_SYSNO_CLASS(syscallno)) {
+ case VG_DARWIN_SYSCALL_CLASS_UNIX:
return ML_(do_syscall_for_client_unix_WRK)
- (sysno_num(syscallno), guest_state,
+ (VG_DARWIN_SYSNO_NUM(syscallno), guest_state,
syscall_mask, restore_mask, nsigwords);
- case SYSCALL_CLASS_UX64:
+ case VG_DARWIN_SYSCALL_CLASS_UX64:
return ML_(do_syscall_for_client_ux64_WRK)
- (sysno_num(syscallno), guest_state,
+ (VG_DARWIN_SYSNO_NUM(syscallno), guest_state,
syscall_mask, restore_mask, nsigwords);
- case SYSCALL_CLASS_MACH:
+ case VG_DARWIN_SYSCALL_CLASS_MACH:
return ML_(do_syscall_for_client_mach_WRK)
- (sysno_num(syscallno), guest_state,
+ (VG_DARWIN_SYSNO_NUM(syscallno), guest_state,
syscall_mask, restore_mask, nsigwords);
- case SYSCALL_CLASS_MDEP:
+ case VG_DARWIN_SYSCALL_CLASS_MDEP:
return ML_(do_syscall_for_client_mdep_WRK)
- (sysno_num(syscallno), guest_state,
+ (VG_DARWIN_SYSNO_NUM(syscallno), guest_state,
syscall_mask, restore_mask, nsigwords);
default:
vg_assert(0);
@@ -506,27 +506,27 @@
case VEX_TRC_JMP_SYS_INT128:
// int $0x80 = Unix, 64-bit result
vg_assert(canonical->sysno >= 0);
- canonical->sysno = SYSCALL_CONSTRUCT_UX64(canonical->sysno);
+ canonical->sysno = VG_DARWIN_SYSCALL_CONSTRUCT_UX64(canonical->sysno);
break;
case VEX_TRC_JMP_SYS_SYSENTER:
// syscall = Unix, 32-bit result
// OR Mach, 32-bit result
if (canonical->sysno >= 0) {
// fixme hack I386_SYSCALL_NUMBER_MASK
- canonical->sysno = SYSCALL_CONSTRUCT_UNIX(canonical->sysno & 0xffff);
+ canonical->sysno = VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(canonical->sysno & 0xffff);
} else {
- canonical->sysno = SYSCALL_CONSTRUCT_MACH(-canonical->sysno);
+ canonical->sysno = VG_DARWIN_SYSCALL_CONSTRUCT_MACH(-canonical->sysno);
}
break;
case VEX_TRC_JMP_SYS_INT129:
// int $0x81 = Mach, 32-bit result
vg_assert(canonical->sysno < 0);
- canonical->sysno = SYSCALL_CONSTRUCT_MACH(-canonical->sysno);
+ canonical->sysno = VG_DARWIN_SYSCALL_CONSTRUCT_MACH(-canonical->sysno);
break;
case VEX_TRC_JMP_SYS_INT130:
// int $0x82 = mdep, 32-bit result
vg_assert(canonical->sysno >= 0);
- canonical->sysno = SYSCALL_CONSTRUCT_MDEP(canonical->sysno);
+ canonical->sysno = VG_DARWIN_SYSCALL_CONSTRUCT_MDEP(canonical->sysno);
break;
default:
vg_assert(0);
@@ -555,7 +555,7 @@
// GrP fixme hack handle syscall()
// GrP fixme what about __syscall() ?
// stack[0] is return address
- canonical->sysno = SYSCALL_CONSTRUCT_UNIX(gst->guest_RDI);
+ canonical->sysno = VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(gst->guest_RDI);
vg_assert(canonical->sysno != __NR_syscall);
canonical->arg1 = gst->guest_RSI;
canonical->arg2 = gst->guest_RDX;
@@ -567,7 +567,7 @@
canonical->arg8 = stack[3];
PRINT("SYSCALL[%d,?](%5lld) syscall(#%x, ...); please stand by...\n",
- VG_(getpid)(), /*tid,*/ (Long)0, sysno_print(canonical->sysno));
+ VG_(getpid)(), /*tid,*/ (Long)0, VG_DARWIN_SYSNO_PRINT(canonical->sysno));
}
// no canonical->sysno adjustment needed
@@ -649,7 +649,7 @@
VexGuestX86State* gst = (VexGuestX86State*)gst_vanilla;
UWord *stack = (UWord *)gst->guest_ESP;
- gst->guest_EAX = sysno_num(canonical->sysno);
+ gst->guest_EAX = VG_DARWIN_SYSNO_NUM(canonical->sysno);
// GrP fixme? gst->guest_TEMP_EFLAG_C = 0;
// stack[0] is return address
@@ -666,7 +666,7 @@
VexGuestAMD64State* gst = (VexGuestAMD64State*)gst_vanilla;
UWord *stack = (UWord *)gst->guest_RSP;
- gst->guest_RAX = sysno_num(canonical->sysno);
+ gst->guest_RAX = VG_DARWIN_SYSNO_NUM(canonical->sysno);
// GrP fixme? gst->guest_TEMP_EFLAG_C = 0;
// stack[0] is return address
@@ -732,25 +732,25 @@
UWord val2;
switch (gst->guest_SC_CLASS) {
- case SYSCALL_CLASS_UX64:
+ case VG_DARWIN_SYSCALL_CLASS_UX64:
// int $0x80 = Unix, 64-bit result
err = carry;
val = gst->guest_EAX;
val2 = gst->guest_EDX;
break;
- case SYSCALL_CLASS_UNIX:
+ case VG_DARWIN_SYSCALL_CLASS_UNIX:
// syscall = Unix, 32-bit result
err = carry;
val = gst->guest_EAX;
val2 = 0;
break;
- case SYSCALL_CLASS_MACH:
+ case VG_DARWIN_SYSCALL_CLASS_MACH:
// int $0x81 = Mach, 32-bit result
err = 0;
val = gst->guest_EAX;
val2 = 0;
break;
- case SYSCALL_CLASS_MDEP:
+ case VG_DARWIN_SYSCALL_CLASS_MDEP:
// int $0x82 = mdep, 32-bit result
err = 0;
val = gst->guest_EAX;
@@ -782,25 +782,25 @@
UWord val2;
switch (gst->guest_SC_CLASS) {
- case SYSCALL_CLASS_UX64:
+ case VG_DARWIN_SYSCALL_CLASS_UX64:
// int $0x80 = Unix, 128-bit result
err = carry;
val = gst->guest_RAX;
val2 = gst->guest_RDX;
break;
- case SYSCALL_CLASS_UNIX:
+ case VG_DARWIN_SYSCALL_CLASS_UNIX:
// syscall = Unix, 64-bit result
err = carry;
val = gst->guest_RAX;
val2 = 0;
break;
- case SYSCALL_CLASS_MACH:
+ case VG_DARWIN_SYSCALL_CLASS_MACH:
// int $0x81 = Mach, 64-bit result
err = 0;
val = gst->guest_RAX;
val2 = 0;
break;
- case SYSCALL_CLASS_MDEP:
+ case VG_DARWIN_SYSCALL_CLASS_MDEP:
// int $0x82 = mdep, 64-bit result
err = 0;
val = gst->guest_RAX;
@@ -925,13 +925,13 @@
vg_assert(canonical->what == SsComplete);
switch (gst->guest_SC_CLASS) {
- case SYSCALL_CLASS_UX64:
+ case VG_DARWIN_SYSCALL_CLASS_UX64:
// int $0x80 = Unix, 64-bit result
if (!canonical->sres.isError) gst->guest_EDX = canonical->sres.res2;
VG_TRACK( post_reg_write, Vg_CoreSysCall, tid,
OFFSET_x86_EDX, sizeof(UWord) );
- // FALL-THROUGH to SYSCALL_CLASS_UNIX
- case SYSCALL_CLASS_UNIX:
+ // FALL-THROUGH to VG_DARWIN_SYSCALL_CLASS_UNIX
+ case VG_DARWIN_SYSCALL_CLASS_UNIX:
// syscall = Unix, 32-bit result
gst->guest_EAX = val;
LibVEX_GuestX86_put_eflag_c(canonical->sres.isError, gst);
@@ -941,13 +941,13 @@
VG_TRACK( post_reg_write, Vg_CoreSysCall, tid,
offsetof(VexGuestX86State, guest_CC_DEP1), sizeof(UInt) );
break;
- case SYSCALL_CLASS_MACH:
+ case VG_DARWIN_SYSCALL_CLASS_MACH:
// int $0x81 = Mach, 32-bit result
gst->guest_EAX = val;
VG_TRACK( post_reg_write, Vg_CoreSysCall, tid,
OFFSET_x86_EAX, sizeof(UWord) );
break;
- case SYSCALL_CLASS_MDEP:
+ case VG_DARWIN_SYSCALL_CLASS_MDEP:
// int $0x82 = mdep, 32-bit result
gst->guest_EAX = val;
VG_TRACK( post_reg_write, Vg_CoreSysCall, tid,
@@ -965,7 +965,7 @@
vg_assert(canonical->what == SsComplete);
switch (gst->guest_SC_CLASS) {
- case SYSCALL_CLASS_UNIX:
+ case VG_DARWIN_SYSCALL_CLASS_UNIX:
// syscall = Unix, 32-bit result
if (!canonical->sres.isError) gst->guest_RDX = canonical->sres.res2;
VG_TRACK( post_reg_write, Vg_CoreSysCall, tid,
@@ -978,13 +978,13 @@
VG_TRACK( post_reg_write, Vg_CoreSysCall, tid,
offsetof(VexGuestAMD64State, guest_CC_DEP1), sizeof(ULong) );
break;
- case SYSCALL_CLASS_MACH:
+ case VG_DARWIN_SYSCALL_CLASS_MACH:
// int $0x81 = Mach, 32-bit result
gst->guest_RAX = val;
VG_TRACK( post_reg_write, Vg_CoreSysCall, tid,
OFFSET_amd64_RAX, sizeof(UWord) );
break;
- case SYSCALL_CLASS_MDEP:
+ case VG_DARWIN_SYSCALL_CLASS_MDEP:
// int $0x82 = mdep, 32-bit result
gst->guest_RAX = val;
VG_TRACK( post_reg_write, Vg_CoreSysCall, tid,
@@ -1128,7 +1128,7 @@
/*OUT*/UWord* flags )
{
VG_(message)
- (Vg_DebugMsg,"WARNING: unhandled syscall: %lld", (Long)sysno_print(args->sysno));
+ (Vg_DebugMsg,"WARNING: unhandled syscall: %lld", (Long)VG_DARWIN_SYSNO_PRINT(args->sysno));
# if defined(VGO_aix5)
VG_(message)
(Vg_DebugMsg," name of syscall: \"%s\"",
@@ -1169,21 +1169,21 @@
sys = ML_(get_ppc64_aix5_syscall_entry) ( syscallno );
# elif defined(VGO_darwin)
- Int idx = sysno_index(syscallno);
+ Int idx = VG_DARWIN_SYSNO_INDEX(syscallno);
- switch (sysno_class(syscallno)) {
- case SYSCALL_CLASS_UX64:
- case SYSCALL_CLASS_UNIX:
+ 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)) {
sys = &ML_(syscall_table)[idx];
}
break;
- case SYSCALL_CLASS_MACH:
+ case VG_DARWIN_SYSCALL_CLASS_MACH:
if (idx >= 0 && idx < ML_(mach_trap_table_size)) {
sys = &ML_(mach_trap_table)[idx];
}
break;
- case SYSCALL_CLASS_MDEP:
+ case VG_DARWIN_SYSCALL_CLASS_MDEP:
if (idx >= 0 && idx < ML_(mdep_trap_table_size)) {
sys = &ML_(mdep_trap_table)[idx];
}
@@ -1367,7 +1367,7 @@
#if defined(VGO_darwin)
// Record syscall class.
- tst->arch.vex.guest_SC_CLASS = sysno_class(sysno);
+ tst->arch.vex.guest_SC_CLASS = VG_DARWIN_SYSNO_CLASS(sysno);
#endif
/* The default what-to-do-next thing is hand the syscall to the
@@ -1404,7 +1404,7 @@
*/
{
- PRINT("SYSCALL[%d,%d](%5lld) ", VG_(getpid)(), tid, (Long)sysno_print(sysno));
+ PRINT("SYSCALL[%d,%d](%5lld) ", VG_(getpid)(), tid, (Long)VG_DARWIN_SYSNO_PRINT(sysno));
// VG_(check_segments)("### before syscall");
}
@@ -1526,7 +1526,7 @@
vg_assert(sci->status.what == SsComplete);
PRINT("SYSCALL[%d,%d](%5ld) ... [async] --> %s(0x%llx)",
- VG_(getpid)(), tid, sysno_print(sysno),
+ VG_(getpid)(), tid, VG_DARWIN_SYSNO_PRINT(sysno),
sci->status.sres.isError ? "Failure" : "Success",
sci->status.sres.isError ? (ULong)sci->status.sres.err
: (ULong)sci->status.sres.res );
@@ -1984,7 +1984,7 @@
VG_(acquire_BigLock)(tid, "wqthread_continue");
PRINT("SYSCALL[%d,%d](%5lld) workq_ops() starting new workqueue item\n",
- VG_(getpid)(), tid, (Long)sysno_print(__NR_workq_ops));
+ VG_(getpid)(), tid, (Long)VG_DARWIN_SYSNO_PRINT(__NR_workq_ops));
vg_assert(VG_(is_valid_tid)(tid));
vg_assert(tid >= 1 && tid < VG_N_THREADS);
Modified: branches/DARWIN/coregrind/pub_core_vkiscnums.h
===================================================================
--- branches/DARWIN/coregrind/pub_core_vkiscnums.h 2009-01-09 01:07:02 UTC (rev 8928)
+++ branches/DARWIN/coregrind/pub_core_vkiscnums.h 2009-01-09 02:46:10 UTC (rev 8929)
@@ -1,7 +1,6 @@
/*--------------------------------------------------------------------*/
-/*--- Top level for kernel interface declarations. ---*/
-/*--- pub_core_vkiscnums.h ---*/
+/*--- Syscall numbers and related operations. pub_core_vkiscnums.h ---*/
/*--------------------------------------------------------------------*/
/*
@@ -47,12 +46,35 @@
/* Make it possible to include this file in assembly sources. */
#if !defined(VG_IN_ASSEMBLY_SOURCE)
-#if defined(VGO_aix5)
+#if defined(VGO_linux)
+ // Nothing
+
+#elif defined(VGO_aix5)
/* Bind the given syscall name to the given number. Returns True if
successful, False if the name is unknown. */
extern Bool VG_(aix5_register_syscall)( Int, UChar* );
+
+#elif defined(VGO_darwin)
+
+/* Macros for working out which syscall a syscall number refers to. */
+#define VG_DARWIN_SYSNO_INDEX(sysno) ((sysno) & VG_DARWIN_SYSCALL_NUMBER_MASK)
+#define VG_DARWIN_SYSNO_CLASS(sysno) ((sysno) >> VG_DARWIN_SYSCALL_CLASS_SHIFT)
+
+/* Convert a syscall number into a nicer form(?) */
+#if defined(VGA_x86)
+# define VG_DARWIN_SYSNO_NUM(sysno) VG_DARWIN_SYSNO_PRINT(sysno)
+#elif defined(VGA_amd64)
+# define VG_DARWIN_SYSNO_NUM(sysno) (sysno)
+#else
+# error unknown arch
#endif
+
+#else
+# error Unknown OS
+#endif // defined(VGO_*)
+
+
#endif /* !defined(VG_IN_ASSEMBLY_SOURCE) */
#endif // __PUB_CORE_VKISCNUMS_H
Modified: branches/DARWIN/exp-ptrcheck/h_main.c
===================================================================
--- branches/DARWIN/exp-ptrcheck/h_main.c 2009-01-09 01:07:02 UTC (rev 8928)
+++ branches/DARWIN/exp-ptrcheck/h_main.c 2009-01-09 02:46:10 UTC (rev 8929)
@@ -2451,9 +2451,14 @@
if (i == n) {
VG_(printf)("sysno == %u\n", sysno);
-# if defined(VGO_aix5)
+# elif defined(VGO_aix5)
+ VG_(printf)("sysno == %u\n", sysno);
VG_(printf)("syscallnm == %s\n",
VG_(aix5_sysno_to_sysname)(sysno));
+# elif defined(VGO_darwin)
+ VG_(printf)("sysno == %u\n", VG_DARWIN_SYSNO_PRINT(sysno));
+# else
+# error "Unsupported OS"
# endif
VG_(tool_panic)("unhandled syscall");
}
Modified: branches/DARWIN/include/pub_tool_vkiscnums.h
===================================================================
--- branches/DARWIN/include/pub_tool_vkiscnums.h 2009-01-09 01:07:02 UTC (rev 8928)
+++ branches/DARWIN/include/pub_tool_vkiscnums.h 2009-01-09 02:46:10 UTC (rev 8929)
@@ -1,7 +1,6 @@
/*--------------------------------------------------------------------*/
-/*--- Top level for kernel interface system call numbers. ---*/
-/*--- pub_tool_vkiscnums.h ---*/
+/*--- Syscall numbers and related operations. pub_tool_vkiscnums.h ---*/
/*--------------------------------------------------------------------*/
/*
@@ -43,6 +42,10 @@
different for each process (in principle; in practice they rarely
change). 32- and 64-bit AIX5 share a common "implementation".
+ On Darwin the __NR_name consts are #define'd constants which are
+ computed using various macros. 32- and 64-bit Darwin share a common
+ "implementation" also.
+
This file is merely a top-level "steering" file, which pulls in the
correct bits for the relevant platform. You should not directly
#include any file in include/vki; instead #include only this one or
@@ -67,19 +70,23 @@
#elif defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
# include "vki/vki-scnums-aix5.h"
-/* Make it possible to include this file in assembly sources. */
-#if !defined(VG_IN_ASSEMBLY_SOURCE)
-
/* Look up the name of a syscall, using the bindings previously
created by VG_(aix5_register_syscall), for the purposes of making
error messages. */
+// DDD: should combine this and VG_DARWIN_SYSNO_PRINT into a single generic
+// function which returns a string, something like VG_(pprint_sysno)().
extern UChar* VG_(aix5_sysno_to_sysname)( Int sysno );
-#endif /* !defined(VG_IN_ASSEMBLY_SOURCE) */
-
-#elif defined(VGO_darwin)
+#elif defined(VGP_x86_darwin) || defined(VGP_amd64_darwin)
# include "vki/vki-scnums-darwin.h"
+/* Convert a syscall number into a nice form for printing. */
+#define VG_DARWIN_SYSNO_PRINT(sysno) \
+ ((VG_DARWIN_SYSNO_CLASS(sysno) == VG_DARWIN_SYSCALL_CLASS_MACH) \
+ ? -VG_DARWIN_SYSNO_INDEX(sysno) \
+ : VG_DARWIN_SYSNO_INDEX(sysno) \
+ )
+
#else
# error Unknown platform
#endif
Modified: branches/DARWIN/include/vki/vki-scnums-darwin.h
===================================================================
--- branches/DARWIN/include/vki/vki-scnums-darwin.h 2009-01-09 01:07:02 UTC (rev 8928)
+++ branches/DARWIN/include/vki/vki-scnums-darwin.h 2009-01-09 02:46:10 UTC (rev 8929)
@@ -38,72 +38,58 @@
// Don't pass __NR_something directly to any syscall instruction.
// Hack: x86 `int $0x80` (unix, 64-bit result) are special.
-#define SYSCALL_CLASS_SHIFT 24
-#define SYSCALL_CLASS_MASK (0xFF << SYSCALL_CLASS_SHIFT)
-#define SYSCALL_NUMBER_MASK (~SYSCALL_CLASS_MASK)
+#define VG_DARWIN_SYSCALL_CLASS_SHIFT 24
+#define VG_DARWIN_SYSCALL_CLASS_MASK (0xFF << VG_DARWIN_SYSCALL_CLASS_SHIFT)
+#define VG_DARWIN_SYSCALL_NUMBER_MASK (~VG_DARWIN_SYSCALL_CLASS_MASK)
-#define SYSCALL_CLASS_NONE 0 /* Invalid */
-#define SYSCALL_CLASS_MACH 1 /* Mach */
-#define SYSCALL_CLASS_UNIX 2 /* Unix/BSD */
-#define SYSCALL_CLASS_MDEP 3 /* Machine-dependent */
-#define SYSCALL_CLASS_DIAG 4 /* Diagnostics */
-#define SYSCALL_CLASS_UX64 99 /* hack: x86 `int $0x80` */
+#define VG_DARWIN_SYSCALL_CLASS_NONE 0 /* Invalid */
+#define VG_DARWIN_SYSCALL_CLASS_MACH 1 /* Mach */
+#define VG_DARWIN_SYSCALL_CLASS_UNIX 2 /* Unix/BSD */
+#define VG_DARWIN_SYSCALL_CLASS_MDEP 3 /* Machine-dependent */
+#define VG_DARWIN_SYSCALL_CLASS_DIAG 4 /* Diagnostics */
+#define VG_DARWIN_SYSCALL_CLASS_UX64 99 /* hack: x86 `int $0x80` */
-#define SYSCALL_CONSTRUCT_MACH(syscall_number) \
- ((SYSCALL_CLASS_MACH << SYSCALL_CLASS_SHIFT) | \
- (SYSCALL_NUMBER_MASK & (syscall_number)))
-#define SYSCALL_CONSTRUCT_UNIX(syscall_number) \
- ((SYSCALL_CLASS_UNIX << SYSCALL_CLASS_SHIFT) | \
- (SYSCALL_NUMBER_MASK & (syscall_number)))
-#define SYSCALL_CONSTRUCT_MDEP(syscall_number) \
- ((SYSCALL_CLASS_MDEP << SYSCALL_CLASS_SHIFT) | \
- (SYSCALL_NUMBER_MASK & (syscall_number)))
-#define SYSCALL_CONSTRUCT_DIAG(syscall_number) \
- ((SYSCALL_CLASS_DIAG << SYSCALL_CLASS_SHIFT) | \
- (SYSCALL_NUMBER_MASK & (syscall_number)))
+#define VG_DARWIN_SYSCALL_CONSTRUCT_MACH(syscall_number) \
+ ((VG_DARWIN_SYSCALL_CLASS_MACH << VG_DARWIN_SYSCALL_CLASS_SHIFT) | \
+ (VG_DARWIN_SYSCALL_NUMBER_MASK & (syscall_number)))
+#define VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(syscall_number) \
+ ((VG_DARWIN_SYSCALL_CLASS_UNIX << VG_DARWIN_SYSCALL_CLASS_SHIFT) | \
+ (VG_DARWIN_SYSCALL_NUMBER_MASK & (syscall_number)))
+#define VG_DARWIN_SYSCALL_CONSTRUCT_MDEP(syscall_number) \
+ ((VG_DARWIN_SYSCALL_CLASS_MDEP << VG_DARWIN_SYSCALL_CLASS_SHIFT) | \
+ (VG_DARWIN_SYSCALL_NUMBER_MASK & (syscall_number)))
+#define VG_DARWIN_SYSCALL_CONSTRUCT_DIAG(syscall_number) \
+ ((VG_DARWIN_SYSCALL_CLASS_DIAG << VG_DARWIN_SYSCALL_CLASS_SHIFT) | \
+ (VG_DARWIN_SYSCALL_NUMBER_MASK & (syscall_number)))
#if defined(VGA_x86)
-#define SYSCALL_CONSTRUCT_UX64(syscall_number) \
- ((SYSCALL_CLASS_UX64 << SYSCALL_CLASS_SHIFT) | \
- (SYSCALL_NUMBER_MASK & (syscall_number)))
+#define VG_DARWIN_SYSCALL_CONSTRUCT_UX64(syscall_number) \
+ ((VG_DARWIN_SYSCALL_CLASS_UX64 << VG_DARWIN_SYSCALL_CLASS_SHIFT) | \
+ (VG_DARWIN_SYSCALL_NUMBER_MASK & (syscall_number)))
#else
-#define SYSCALL_CONSTRUCT_UX64(syscall_number) \
- ((SYSCALL_CLASS_UNIX/*not a typo*/ << SYSCALL_CLASS_SHIFT) | \
- (SYSCALL_NUMBER_MASK & (syscall_number)))
+#define VG_DARWIN_SYSCALL_CONSTRUCT_UX64(syscall_number) \
+ ((VG_DARWIN_SYSCALL_CLASS_UNIX/*not a typo*/ << VG_DARWIN_SYSCALL_CLASS_SHIFT) | \
+ (VG_DARWIN_SYSCALL_NUMBER_MASK & (syscall_number)))
#endif
-#define sysno_index(sysno) ((sysno) & SYSCALL_NUMBER_MASK)
-#define sysno_class(sysno) ((sysno) >> SYSCALL_CLASS_SHIFT)
-#define sysno_print(sysno) \
- ((sysno_class(sysno) == SYSCALL_CLASS_MACH) ? -sysno_index(sysno) : sysno_index(sysno))
-
-#if defined(VGA_x86)
-#define sysno_num(sysno) sysno_print(sysno)
-#elif defined(VGA_amd64)
-#define sysno_num(sysno) (sysno)
-#else
-#error unknown arch
-#endif
-
-
// mdep syscalls
#if defined(VGA_x86)
// osfmk/i386/machdep_call.c
-// # define __NR_thread_get_cthread_self SYSCALL_CONSTRUCT_MDEP(0)
-// # define __NR_thread_set_cthread_self SYSCALL_CONSTRUCT_MDEP(1)
-// # define __NR_2 SYSCALL_CONSTRUCT_MDEP(2)
-# define __NR_pthread_set_self SYSCALL_CONSTRUCT_MDEP(3)
-// # define __NR_thread_set_user_ldt SYSCALL_CONSTRUCT_MDEP(4)
-// # define __NR_i386_set_ldt SYSCALL_CONSTRUCT_MDEP(5)
-// # define __NR_i386_get_ldt SYSCALL_CONSTRUCT_MDEP(6)
+// # define __NR_thread_get_cthread_self VG_DARWIN_SYSCALL_CONSTRUCT_MDEP(0)
+// # define __NR_thread_set_cthread_self VG_DARWIN_SYSCALL_CONSTRUCT_MDEP(1)
+// # define __NR_2 VG_DARWIN_SYSCALL_CONSTRUCT_MDEP(2)
+# define __NR_pthread_set_self VG_DARWIN_SYSCALL_CONSTRUCT_MDEP(3)
+// # define __NR_thread_set_user_ldt VG_DARWIN_SYSCALL_CONSTRUCT_MDEP(4)
+// # define __NR_i386_set_ldt VG_DARWIN_SYSCALL_CONSTRUCT_MDEP(5)
+// # define __NR_i386_get_ldt VG_DARWIN_SYSCALL_CONSTRUCT_MDEP(6)
#elif defined(VGA_amd64)
// osfmk/i386/machdep_call.c
-# define __NR_pthread_set_self SYSCALL_CONSTRUCT_MDEP(3)
+# define __NR_pthread_set_self VG_DARWIN_SYSCALL_CONSTRUCT_MDEP(3)
#else
# error unknown architecture
@@ -112,428 +98,428 @@
// osfmk/mach/syscall_sw.h
-#define __NR_mach_reply_port SYSCALL_CONSTRUCT_MACH(26)
-#define __NR_thread_self_trap SYSCALL_CONSTRUCT_MACH(27)
-#define __NR_task_self_trap SYSCALL_CONSTRUCT_MACH(28)
-#define __NR_host_self_trap SYSCALL_CONSTRUCT_MACH(29)
+#define __NR_mach_reply_port VG_DARWIN_SYSCALL_CONSTRUCT_MACH(26)
+#define __NR_thread_self_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(27)
+#define __NR_task_self_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(28)
+#define __NR_host_self_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(29)
-#define __NR_mach_msg_trap SYSCALL_CONSTRUCT_MACH(31)
-#define __NR_mach_msg_overwrite_trap SYSCALL_CONSTRUCT_MACH(32)
-#define __NR_semaphore_signal_trap SYSCALL_CONSTRUCT_MACH(33)
-#define __NR_semaphore_signal_all_trap SYSCALL_CONSTRUCT_MACH(34)
-#define __NR_semaphore_signal_thread_trap SYSCALL_CONSTRUCT_MACH(35)
-#define __NR_semaphore_wait_trap SYSCALL_CONSTRUCT_MACH(36)
-#define __NR_semaphore_wait_signal_trap SYSCALL_CONSTRUCT_MACH(37)
-#define __NR_semaphore_timedwait_trap SYSCALL_CONSTRUCT_MACH(38)
-#define __NR_semaphore_timedwait_signal_trap SYSCALL_CONSTRUCT_MACH(39)
+#define __NR_mach_msg_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(31)
+#define __NR_mach_msg_overwrite_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(32)
+#define __NR_semaphore_signal_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(33)
+#define __NR_semaphore_signal_all_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(34)
+#define __NR_semaphore_signal_thread_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(35)
+#define __NR_semaphore_wait_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(36)
+#define __NR_semaphore_wait_signal_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(37)
+#define __NR_semaphore_timedwait_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(38)
+#define __NR_semaphore_timedwait_signal_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(39)
#if defined(VGA_x86)
-#define __NR_init_process SYSCALL_CONSTRUCT_MACH(41)
-#define __NR_map_fd SYSCALL_CONSTRUCT_MACH(43)
+#define __NR_init_process VG_DARWIN_SYSCALL_CONSTRUCT_MACH(41)
+#define __NR_map_fd VG_DARWIN_SYSCALL_CONSTRUCT_MACH(43)
#endif
-#define __NR_task_name_for_pid SYSCALL_CONSTRUCT_MACH(44)
-#define __NR_task_for_pid SYSCALL_CONSTRUCT_MACH(45)
-#define __NR_pid_for_task SYSCALL_CONSTRUCT_MACH(46)
+#define __NR_task_name_for_pid VG_DARWIN_SYSCALL_CONSTRUCT_MACH(44)
+#define __NR_task_for_pid VG_DARWIN_SYSCALL_CONSTRUCT_MACH(45)
+#define __NR_pid_for_task VG_DARWIN_SYSCALL_CONSTRUCT_MACH(46)
#if defined(VGA_x86)
-#define __NR_macx_swapon SYSCALL_CONSTRUCT_MACH(48)
-#define __NR_macx_swapoff SYSCALL_CONSTRUCT_MACH(49)
-#define __NR_macx_triggers SYSCALL_CONSTRUCT_MACH(51)
-#define __NR_macx_backing_store_suspend SYSCALL_CONSTRUCT_MACH(52)
-#define __NR_macx_backing_store_recovery SYSCALL_CONSTRUCT_MACH(53)
+#define __NR_macx_swapon VG_DARWIN_SYSCALL_CONSTRUCT_MACH(48)
+#define __NR_macx_swapoff VG_DARWIN_SYSCALL_CONSTRUCT_MACH(49)
+#define __NR_macx_triggers VG_DARWIN_SYSCALL_CONSTRUCT_MACH(51)
+#define __NR_macx_backing_store_suspend VG_DARWIN_SYSCALL_CONSTRUCT_MACH(52)
+#define __NR_macx_backing_store_recovery VG_DARWIN_SYSCALL_CONSTRUCT_MACH(53)
#endif
-#define __NR_swtch_pri SYSCALL_CONSTRUCT_MACH(59)
-#define __NR_swtch SYSCALL_CONSTRUCT_MACH(60)
+#define __NR_swtch_pri VG_DARWIN_SYSCALL_CONSTRUCT_MACH(59)
+#define __NR_swtch VG_DARWIN_SYSCALL_CONSTRUCT_MACH(60)
#define __NR_sched_yield __NR_swtch /* linux-alike name */
-#define __NR_syscall_thread_switch SYSCALL_CONSTRUCT_MACH(61)
-#define __NR_clock_sleep_trap SYSCALL_CONSTRUCT_MACH(62)
+#define __NR_syscall_thread_switch VG_DARWIN_SYSCALL_CONSTRUCT_MACH(61)
+#define __NR_clock_sleep_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(62)
-#define __NR_mach_timebase_info SYSCALL_CONSTRUCT_MACH(89)
-#define __NR_mach_wait_until SYSCALL_CONSTRUCT_MACH(90)
-#define __NR_mk_timer_create SYSCALL_CONSTRUCT_MACH(91)
-#define __NR_mk_timer_destroy SYSCALL_CONSTRUCT_MACH(92)
-#define __NR_mk_timer_arm SYSCALL_CONSTRUCT_MACH(93)
-#define __NR_mk_timer_cancel SYSCALL_CONSTRUCT_MACH(94)
+#define __NR_mach_timebase_info VG_DARWIN_SYSCALL_CONSTRUCT_MACH(89)
+#define __NR_mach_wait_until VG_DARWIN_SYSCALL_CONSTRUCT_MACH(90)
+#define __NR_mk_timer_create VG_DARWIN_SYSCALL_CONSTRUCT_MACH(91)
+#define __NR_mk_timer_destroy VG_DARWIN_SYSCALL_CONSTRUCT_MACH(92)
+#define __NR_mk_timer_arm VG_DARWIN_SYSCALL_CONSTRUCT_MACH(93)
+#define __NR_mk_timer_cancel VG_DARWIN_SYSCALL_CONSTRUCT_MACH(94)
-#define __NR_iokit_user_client_trap SYSCALL_CONSTRUCT_MACH(100)
+#define __NR_iokit_user_client_trap VG_DARWIN_SYSCALL_CONSTRUCT_MACH(100)
// bsd/sys/syscall.h
-#define __NR_syscall SYSCALL_CONSTRUCT_UNIX(0)
-#define __NR_exit SYSCALL_CONSTRUCT_UNIX(1)
-#define __NR_fork SYSCALL_CONSTRUCT_UX64(2)
-#define __NR_read SYSCALL_CONSTRUCT_UNIX(3)
-#define __NR_write SYSCALL_CONSTRUCT_UNIX(4)
-#define __NR_open SYSCALL_CONSTRUCT_UNIX(5)
-#define __NR_close SYSCALL_CONSTRUCT_UNIX(6)
-#define __NR_wait4 SYSCALL_CONSTRUCT_UNIX(7)
+#define __NR_syscall VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(0)
+#define __NR_exit VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(1)
+#define __NR_fork VG_DARWIN_SYSCALL_CONSTRUCT_UX64(2)
+#define __NR_read VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(3)
+#define __NR_write VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(4)
+#define __NR_open VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(5)
+#define __NR_close VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(6)
+#define __NR_wait4 VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(7)
/* 8 old creat */
-#define __NR_link SYSCALL_CONSTRUCT_UNIX(9)
-#define __NR_unlink SYSCALL_CONSTRUCT_UNIX(10)
+#define __NR_link VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(9)
+#define __NR_unlink VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(10)
/* 11 old execv */
-#define __NR_chdir SYSCALL_CONSTRUCT_UNIX(12)
-#define __NR_fchdir SYSCALL_CONSTRUCT_UNIX(13)
-#define __NR_mknod SYSCALL_CONSTRUCT_UNIX(14)
-#define __NR_chmod SYSCALL_CONSTRUCT_UNIX(15)
-#define __NR_chown SYSCALL_CONSTRUCT_UNIX(16)
+#define __NR_chdir VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(12)
+#define __NR_fchdir VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(13)
+#define __NR_mknod VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(14)
+#define __NR_chmod VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(15)
+#define __NR_chown VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(16)
/* 17 old break */
-#define __NR_getfsstat SYSCALL_CONSTRUCT_UNIX(18)
+#define __NR_getfsstat VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(18)
/* 19 old lseek */
-#define __NR_getpid SYSCALL_CONSTRUCT_UNIX(20)
+#define __NR_getpid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(20)
/* 21 old mount */
/* 22 old umount */
-#define __NR_setuid SYSCALL_CONSTRUCT_UNIX(23)
-#define __NR_getuid SYSCALL_CONSTRUCT_UNIX(24)
-#define __NR_geteuid SYSCALL_CONSTRUCT_UNIX(25)
-#define __NR_ptrace SYSCALL_CONSTRUCT_UNIX(26)
-#define __NR_recvmsg SYSCALL_CONSTRUCT_UNIX(27)
-#define __NR_sendmsg SYSCALL_CONSTRUCT_UNIX(28)
-#define __NR_recvfrom SYSCALL_CONSTRUCT_UNIX(29)
-#define __NR_accept SYSCALL_CONSTRUCT_UNIX(30)
-#define __NR_getpeername SYSCALL_CONSTRUCT_UNIX(31)
-#define __NR_getsockname SYSCALL_CONSTRUCT_UNIX(32)
-#define __NR_access SYSCALL_CONSTRUCT_UNIX(33)
-#define __NR_chflags SYSCALL_CONSTRUCT_UNIX(34)
-#define __NR_fchflags SYSCALL_CONSTRUCT_UNIX(35)
-#define __NR_sync SYSCALL_CONSTRUCT_UNIX(36)
-#define __NR_kill SYSCALL_CONSTRUCT_UNIX(37)
+#define __NR_setuid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(23)
+#define __NR_getuid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(24)
+#define __NR_geteuid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(25)
+#define __NR_ptrace VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(26)
+#define __NR_recvmsg VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(27)
+#define __NR_sendmsg VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(28)
+#define __NR_recvfrom VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(29)
+#define __NR_accept VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(30)
+#define __NR_getpeername VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(31)
+#define __NR_getsockname VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(32)
+#define __NR_access VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(33)
+#define __NR_chflags VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(34)
+#define __NR_fchflags VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(35)
+#define __NR_sync VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(36)
+#define __NR_kill VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(37)
/* 38 old stat */
-#define __NR_getppid SYSCALL_CONSTRUCT_UNIX(39)
+#define __NR_getppid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(39)
/* 40 old lstat */
-#define __NR_dup SYSCALL_CONSTRUCT_UNIX(41)
-#define __NR_pipe SYSCALL_CONSTRUCT_UX64(42)
-#define __NR_getegid SYSCALL_CONSTRUCT_UNIX(43)
-#define __NR_profil SYSCALL_CONSTRUCT_UNIX(44)
+#define __NR_dup VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(41)
+#define __NR_pipe VG_DARWIN_SYSCALL_CONSTRUCT_UX64(42)
+#define __NR_getegid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(43)
+#define __NR_profil VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(44)
/* 45 old ktrace */
-#define __NR_sigaction SYSCALL_CONSTRUCT_UNIX(46)
-#define __NR_getgid SYSCALL_CONSTRUCT_UNIX(47)
-#define __NR_sigprocmask SYSCALL_CONSTRUCT_UNIX(48)
-#define __NR_getlogin SYSCALL_CONSTRUCT_UNIX(49)
-#define __NR_setlogin SYSCALL_CONSTRUCT_UNIX(50)
-#define __NR_acct SYSCALL_CONSTRUCT_UNIX(51)
-#define __NR_sigpending SYSCALL_CONSTRUCT_UNIX(52)
-#define __NR_sigaltstack SYSCALL_CONSTRUCT_UNIX(53)
-#define __NR_ioctl SYSCALL_CONSTRUCT_UNIX(54)
-#define __NR_reboot SYSCALL_CONSTRUCT_UNIX(55)
-#define __NR_revoke SYSCALL_CONSTRUCT_UNIX(56)
-#define __NR_symlink SYSCALL_CONSTRUCT_UNIX(57)
-#define __NR_readlink SYSCALL_CONSTRUCT_UNIX(58)
-#define __NR_execve SYSCALL_CONSTRUCT_UNIX(59)
-#define __NR_umask SYSCALL_CONSTRUCT_UNIX(60)
-#define __NR_chroot SYSCALL_CONSTRUCT_UNIX(61)
+#define __NR_sigaction VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(46)
+#define __NR_getgid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(47)
+#define __NR_sigprocmask VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(48)
+#define __NR_getlogin VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(49)
+#define __NR_setlogin VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(50)
+#define __NR_acct VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(51)
+#define __NR_sigpending VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(52)
+#define __NR_sigaltstack VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(53)
+#define __NR_ioctl VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(54)
+#define __NR_reboot VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(55)
+#define __NR_revoke VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(56)
+#define __NR_symlink VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(57)
+#define __NR_readlink VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(58)
+#define __NR_execve VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(59)
+#define __NR_umask VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(60)
+#define __NR_chroot VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(61)
/* 62 old fstat */
/* 63 used internally , reserved */
/* 64 old getpagesize */
-#define __NR_msync SYSCALL_CONSTRUCT_UNIX(65)
-#define __NR_vfork SYSCALL_CONSTRUCT_UNIX(66)
+#define __NR_msync VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(65)
+#define __NR_vfork VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(66)
/* 67 old vread */
/* 68 old vwrite */
/* 69 old sbrk */
/* 70 old sstk */
/* 71 old mmap */
/* 72 old vadvise */
-#define __NR_munmap SYSCALL_CONSTRUCT_UNIX(73)
-#define __NR_mprotect SYSCALL_CONSTRUCT_UNIX(74)
-#define __NR_madvise SYSCALL_CONSTRUCT_UNIX(75)
+#define __NR_munmap VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(73)
+#define __NR_mprotect VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(74)
+#define __NR_madvise VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(75)
/* 76 old vhangup */
/* 77 old vlimit */
-#define __NR_mincore SYSCALL_CONSTRUCT_UNIX(78)
-#define __NR_getgroups SYSCALL_CONSTRUCT_UNIX(79)
-#define __NR_setgroups SYSCALL_CONSTRUCT_UNIX(80)
-#define __NR_getpgrp SYSCALL_CONSTRUCT_UNIX(81)
-#define __NR_setpgid SYSCALL_CONSTRUCT_UNIX(82)
-#define __NR_setitimer SYSCALL_CONSTRUCT_UNIX(83)
+#define __NR_mincore VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(78)
+#define __NR_getgroups VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(79)
+#define __NR_setgroups VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(80)
+#define __NR_getpgrp VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(81)
+#define __NR_setpgid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(82)
+#define __NR_setitimer VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(83)
/* 84 old wait */
-#define __NR_swapon SYSCALL_CONSTRUCT_UNIX(85)
-#define __NR_getitimer SYSCALL_CONSTRUCT_UNIX(86)
+#define __NR_swapon VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(85)
+#define __NR_getitimer VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(86)
/* 87 old gethostname */
/* 88 old sethostname */
-#define __NR_getdtablesize SYSCALL_CONSTRUCT_UNIX(89)
-#define __NR_dup2 SYSCALL_CONSTRUCT_UNIX(90)
+#define __NR_getdtablesize VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(89)
+#define __NR_dup2 VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(90)
/* 91 old getdopt */
-#define __NR_fcntl SYSCALL_CONSTRUCT_UNIX(92)
-#define __NR_select SYSCALL_CONSTRUCT_UNIX(93)
+#define __NR_fcntl VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(92)
+#define __NR_select VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(93)
/* 94 old setdopt */
-#define __NR_fsync SYSCALL_CONSTRUCT_UNIX(95)
-#define __NR_setpriority SYSCALL_CONSTRUCT_UNIX(96)
-#define __NR_socket SYSCALL_CONSTRUCT_UNIX(97)
-#define __NR_connect SYSCALL_CONSTRUCT_UNIX(98)
+#define __NR_fsync VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(95)
+#define __NR_setpriority VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(96)
+#define __NR_socket VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(97)
+#define __NR_connect VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(98)
/* 99 old accept */
-#define __NR_getpriority SYSCALL_CONSTRUCT_UNIX(100)
+#define __NR_getpriority VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(100)
/* 101 old send */
/* 102 old recv */
/* 103 old sigreturn */
-#define __NR_bind SYSCALL_CONSTRUCT_UNIX(104)
-#define __NR_setsockopt SYSCALL_CONSTRUCT_UNIX(105)
-#define __NR_listen SYSCALL_CONSTRUCT_UNIX(106)
+#define __NR_bind VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(104)
+#define __NR_setsockopt VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(105)
+#define __NR_listen VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(106)
/* 107 old vtimes */
/* 108 old sigvec */
/* 109 old sigblock */
/* 110 old sigsetmask */
-#define __NR_sigsuspend SYSCALL_CONSTRUCT_UNIX(111)
+#define __NR_sigsuspend VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(111)
/* 112 old sigstack */
/* 113 old recvmsg */
/* 114 old sendmsg */
/* 115 old vtrace */
-#define __NR_gettimeofday SYSCALL_CONSTRUCT_UNIX(116)
-#define __NR_getrusage SYSCALL_CONSTRUCT_UNIX(117)
-#define __NR_getsockopt SYSCALL_CONSTRUCT_UNIX(118)
+#define __NR_gettimeofday VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(116)
+#define __NR_getrusage VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(117)
+#define __NR_getsockopt VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(118)
/* 119 old resuba */
-#define __NR_readv SYSCALL_CONSTRUCT_UNIX(120)
-#define __NR_writev SYSCALL_CONSTRUCT_UNIX(121)
-#define __NR_settimeofday SYSCALL_CONSTRUCT_UNIX(122)
-#define __NR_fchown SYSCALL_CONSTRUCT_UNIX(123)
-#define __NR_fchmod SYSCALL_CONSTRUCT_UNIX(124)
+#define __NR_readv VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(120)
+#define __NR_writev VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(121)
+#define __NR_settimeofday VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(122)
+#define __NR_fchown VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(123)
+#define __NR_fchmod VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(124)
/* 125 old recvfrom */
-#define __NR_setreuid SYSCALL_CONSTRUCT_UNIX(126)
-#define __NR_setregid SYSCALL_CONSTRUCT_UNIX(127)
-#define __NR_rename SYSCALL_CONSTRUCT_UNIX(128)
+#define __NR_setreuid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(126)
+#define __NR_setregid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(127)
+#define __NR_rename VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(128)
/* 129 old truncate */
/* 130 old ftruncate */
-#define __NR_flock SYSCALL_CONSTRUCT_UNIX(131)
-#define __NR_mkfifo SYSCALL_CONSTRUCT_UNIX(132)
-#define __NR_sendto SYSCALL_CONSTRUCT_UNIX(133)
-#define __NR_shutdown SYSCALL_CONSTRUCT_UNIX(134)
-#define __NR_socketpair SYSCALL_CONSTRUCT_UNIX(135)
-#define __NR_mkdir SYSCALL_CONSTRUCT_UNIX(136)
-#define __NR_rmdir SYSCALL_CONSTRUCT_UNIX(137)
-#define __NR_utimes SYSCALL_CONSTRUCT_UNIX(138)
-#define __NR_futimes SYSCALL_CONSTRUCT_UNIX(139)
-#define __NR_adjtime SYSCALL_CONSTRUCT_UNIX(140)
+#define __NR_flock VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(131)
+#define __NR_mkfifo VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(132)
+#define __NR_sendto VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(133)
+#define __NR_shutdown VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(134)
+#define __NR_socketpair VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(135)
+#define __NR_mkdir VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(136)
+#define __NR_rmdir VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(137)
+#define __NR_utimes VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(138)
+#define __NR_futimes VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(139)
+#define __NR_adjtime VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(140)
/* 141 old getpeername */
-#define __NR_gethostuuid SYSCALL_CONSTRUCT_UNIX(142)
+#define __NR_gethostuuid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(142)
/* 142 old gethostid */
/* 143 old sethostid */
/* 144 old getrlimit */
/* 145 old setrlimit */
/* 146 old killpg */
-#define __NR_setsid SYSCALL_CONSTRUCT_UNIX(147)
+#define __NR_setsid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(147)
/* 148 old setquota */
/* 149 old qquota */
/* 150 old getsockname */
-#define __NR_getpgid SYSCALL_CONSTRUCT_UNIX(151)
-#define __NR_setprivexec SYSCALL_CONSTRUCT_UNIX(152)
-#define __NR_pread SYSCALL_CONSTRUCT_UNIX(153)
-#define __NR_pwrite SYSCALL_CONSTRUCT_UNIX(154)
-#define __NR_nfssvc SYSCALL_CONSTRUCT_UNIX(155)
+#define __NR_getpgid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(151)
+#define __NR_setprivexec VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(152)
+#define __NR_pread VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(153)
+#define __NR_pwrite VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(154)
+#define __NR_nfssvc VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(155)
/* 156 old getdirentries */
-#define __NR_statfs SYSCALL_CONSTRUCT_UNIX(157)
-#define __NR_fstatfs SYSCALL_CONSTRUCT_UNIX(158)
-#define __NR_unmount SYSCALL_CONSTRUCT_UNIX(159)
+#define __NR_statfs VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(157)
+#define __NR_fstatfs VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(158)
+#define __NR_unmount VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(159)
/* 160 old async_daemon */
-#define __NR_getfh SYSCALL_CONSTRUCT_UNIX(161)
+#define __NR_getfh VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(161)
/* 162 old getdomainname */
/* 163 old setdomainname */
/* 164 */
-#define __NR_quotactl SYSCALL_CONSTRUCT_UNIX(165)
+#define __NR_quotactl VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(165)
/* 166 old exportfs */
-#define __NR_mount SYSCALL_CONSTRUCT_UNIX(167)
+#define __NR_mount VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(167)
/* 168 old ustat */
-#define __NR_csops SYSCALL_CONSTRUCT_UNIX(169)
+#define __NR_csops VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(169)
/* 170 old table */
/* 171 old wait3 */
/* 172 old rpause */
-#define __NR_waitid SYSCALL_CONSTRUCT_UNIX(173)
+#define __NR_waitid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(173)
/* 174 old getdents */
/* 175 old gc_control */
-#define __NR_add_profil SYSCALL_CONSTRUCT_UNIX(176)
+#define __NR_add_profil VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(176)
/* 177 */
/* 178 */
/* 179 */
-#define __NR_kdebug_trace SYSCALL_CONSTRUCT_UNIX(180)
-#define __NR_setgid SYSCALL_CONSTRUCT_UNIX(181)
-#define __NR_setegid SYSCALL_CONSTRUCT_UNIX(182)
-#define __NR_seteuid SYSCALL_CONSTRUCT_UNIX(183)
-#define __NR_sigreturn SYSCALL_CONSTRUCT_UNIX(184)
-#define __NR_chud SYSCALL_CONSTRUCT_UNIX(185)
+#define __NR_kdebug_trace VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(180)
+#define __NR_setgid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(181)
+#define __NR_setegid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(182)
+#define __NR_seteuid VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(183)
+#define __NR_sigreturn VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(184)
+#define __NR_chud VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(185)
/* 186 */
/* 187 */
-#define __NR_stat SYSCALL_CONSTRUCT_UNIX(188)
-#define __NR_fstat SYSCALL_CONSTRUCT_UNIX(189)
-#define __NR_lstat SYSCALL_CONSTRUCT_UNIX(190)
-#define __NR_pathconf SYSCALL_CONSTRUCT_UNIX(191)
-#define __NR_fpathconf SYSCALL_CONSTRUCT_UNIX(192)
+#define __NR_stat VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(188)
+#define __NR_fstat VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(189)
+#define __NR_lstat VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(190)
+#define __NR_pathconf VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(191)
+#define __NR_fpathconf VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(192)
/* 193 */
-#define __NR_getrlimit SYSCALL_CONSTRUCT_UNIX(194)
-#define __NR_setrlimit SYSCALL_CONSTRUCT_UNIX(195)
-#define __NR_getdirentries SYSCALL_CONSTRUCT_UNIX(196)
-#define __NR_mmap SYSCALL_CONSTRUCT_UNIX(197)
+#define __NR_getrlimit VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(194)
+#define __NR_setrlimit VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(195)
+#define __NR_getdirentries VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(196)
+#define __NR_mmap VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(197)
/* 198 __syscall */
-#define __NR_lseek SYSCALL_CONSTRUCT_UX64(199)
-#define __NR_truncate SYSCALL_CONSTRUCT_UNIX(200)
-#define __NR_ftruncate SYSCALL_CONSTRUCT_UNIX(201)
-#define __NR___sysctl SYSCALL_CONSTRUCT_UNIX(202)
-#define __NR_mlock SYSCALL_CONSTRUCT_UNIX(203)
-#define __NR_munlock SYSCALL_CONSTRUCT_UNIX(204)
-#define __NR_undelete SYSCALL_CONSTRUCT_UNIX(205)
-#define __NR_ATsocket SYSCALL_CONSTRUCT_UNIX(206)
-#define __NR_ATgetmsg SYSCALL_CONSTRUCT_UNIX(207)
-#define __NR_ATputmsg SYSCALL_CONSTRUCT_UNIX(208)
-#define __NR_ATPsndreq SYSCALL_CONSTRUCT_UNIX(209)
-#define __NR_ATPsndrsp SYSCALL_CONSTRUCT_UNIX(210)
-#define __NR_ATPgetreq SYSCALL_CONSTRUCT_UNIX(211)
-#define __NR_ATPgetrsp SYSCALL_CONSTRUCT_UNIX(212)
+#define __NR_lseek VG_DARWIN_SYSCALL_CONSTRUCT_UX64(199)
+#define __NR_truncate VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(200)
+#define __NR_ftruncate VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(201)
+#define __NR___sysctl VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(202)
+#define __NR_mlock VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(203)
+#define __NR_munlock VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(204)
+#define __NR_undelete VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(205)
+#define __NR_ATsocket VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(206)
+#define __NR_ATgetmsg VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(207)
+#define __NR_ATputmsg VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(208)
+#define __NR_ATPsndreq VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(209)
+#define __NR_ATPsndrsp VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(210)
+#define __NR_ATPgetreq VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(211)
+#define __NR_ATPgetrsp VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(212)
/* 213 Reserved for AppleTalk */
-#define __NR_kqueue_from_portset_np SYSCALL_CONSTRUCT_UNIX(214)
-#define __NR_kqueue_portset_np SYSCALL_CONSTRUCT_UNIX(215)
-#define __NR_mkcomplex SYSCALL_CONSTRUCT_UNIX(216)
-#define __NR_statv SYSCALL_CONSTRUCT_UNIX(217)
-#define __NR_lstatv SYSCALL_CONSTRUCT_UNIX(218)
-#define __NR_fstatv SYSCALL_CONSTRUCT_UNIX(219)
-#define __NR_getattrlist SYSCALL_CONSTRUCT_UNIX(220)
-#define __NR_setattrlist SYSCALL_CONSTRUCT_UNIX(221)
-#define __NR_getdirentriesattr SYSCALL_CONSTRUCT_UNIX(222)
-#define __NR_exchangedata SYSCALL_CONSTRUCT_UNIX(223)
+#define __NR_kqueue_from_portset_np VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(214)
+#define __NR_kqueue_portset_np VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(215)
+#define __NR_mkcomplex VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(216)
+#define __NR_statv VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(217)
+#define __NR_lstatv VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(218)
+#define __NR_fstatv VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(219)
+#define __NR_getattrlist VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(220)
+#define __NR_setattrlist VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(221)
+#define __NR_getdirentriesattr VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(222)
+#define __NR_exchangedata VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(223)
/* 224 checkuseraccess */
-#define __NR_searchfs SYSCALL_CONSTRUCT_UNIX(225)
-#define __NR_delete SYSCALL_CONSTRUCT_UNIX(226)
-#define __NR_copyfile SYSCALL_CONSTRUCT_UNIX(227)
+#define __NR_searchfs VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(225)
+#define __NR_delete VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(226)
+#define __NR_copyfile VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(227)
/* 228 */
/* 229 */
-#define __NR_poll SYSCALL_CONSTRUCT_UNIX(230)
-#define __NR_watchevent SYSCALL_CONSTRUCT_UNIX(231)
-#define __NR_waitevent SYSCALL_CONSTRUCT_UNIX(232)
-#define __NR_modwatch SYSCALL_CONSTRUCT_UNIX(233)
-#define __NR_getxattr SYSCALL_CONSTRUCT_UNIX(234)
-#define __NR_fgetxattr SYSCALL_CONSTRUCT_UNIX(235)
-#define __NR_setxattr SYSCALL_CONSTRUCT_UNIX(236)
-#define __NR_fsetxattr SYSCALL_CONSTRUCT_UNIX(237)
-#define __NR_removexattr SYSCALL_CONSTRUCT_UNIX(238)
-#define __NR_fremovexattr SYSCALL_CONSTRUCT_UNIX(239)
-#define __NR_listxattr SYSCALL_CONSTRUCT_UNIX(240)
-#define __NR_flistxattr SYSCALL_CONSTRUCT_UNIX(241)
-#define __NR_fsctl SYSCALL_CONSTRUCT_UNIX(242)
-#define __NR_initgroups SYSCALL_CONSTRUCT_UNIX(243)
-#define __NR_posix_spawn SYSCALL_CONSTRUCT_UNIX(244)
+#define __NR_poll VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(230)
+#define __NR_watchevent VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(231)
+#define __NR_waitevent VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(232)
+#define __NR_modwatch VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(233)
+#define __NR_getxattr VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(234)
+#define __NR_fgetxattr VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(235)
+#define __NR_setxattr VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(236)
+#define __NR_fsetxattr VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(237)
+#define __NR_removexattr VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(238)
+#define __NR_fremovexattr VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(239)
+#define __NR_listxattr VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(240)
+#define __NR_flistxattr VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(241)
+#define __NR_fsctl VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(242)
+#define __NR_initgroups VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(243)
+#define __NR_posix_spawn VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(244)
/* 245 */
/* 246 */
-#define __NR_nfsclnt SYSCALL_CONSTRUCT_UNIX(247)
-#define __NR_fhopen SYSCALL_CONSTRUCT_UNIX(248)
+#define __NR_nfsclnt VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(247)
+#define __NR_fhopen VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(248)
/* 249 */
-#define __NR_minherit SYSCALL_CONSTRUCT_UNIX(250)
-#define __NR_semsys SYSCALL_CONSTRUCT_UNIX(251)
-#define __NR_msgsys SYSCALL_CONSTRUCT_UNIX(252)
-#define __NR_shmsys SYSCALL_CONSTRUCT_UNIX(253)
-#define __NR_semctl SYSCALL_CONSTRUCT_UNIX(254)
-#define __NR_semget SYSCALL_CONSTRUCT_UNIX(255)
-#define __NR_semop SYSCALL_CONSTRUCT_UNIX(256)
+#define __NR_minherit VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(250...
[truncated message content] |
|
From: <sv...@va...> - 2009-01-09 01:07:09
|
Author: njn
Date: 2009-01-09 01:07:02 +0000 (Fri, 09 Jan 2009)
New Revision: 8928
Log:
DARWIN/include/vki/vki-darwin.h
DARWIN/coregrind/m_signals.c
DARWIN/coregrind/pub_core_signals.h
Fix hack involving VG_(max_signal). This will make compiling this
branch on Linux easier.
Modified:
branches/DARWIN/coregrind/m_signals.c
branches/DARWIN/coregrind/pub_core_signals.h
branches/DARWIN/include/vki/vki-darwin.h
Modified: branches/DARWIN/coregrind/m_signals.c
===================================================================
--- branches/DARWIN/coregrind/m_signals.c 2009-01-08 23:52:26 UTC (rev 8927)
+++ branches/DARWIN/coregrind/m_signals.c 2009-01-09 01:07:02 UTC (rev 8928)
@@ -107,6 +107,9 @@
#include "pub_core_tooliface.h"
#include "pub_core_coredump.h"
+/* Maximum usable signal. */
+Int VG_(max_signal) = _VKI_NSIG;
+
#if defined(VGO_darwin)
#warning GrP fixme signals
@@ -123,9 +126,6 @@
static const Char *signame(Int sigNo);
-/* Maximum usable signal. */
-Int VG_(max_signal) = _VKI_NSIG;
-
#define N_QUEUED_SIGNALS 8
typedef struct SigQueue {
Modified: branches/DARWIN/coregrind/pub_core_signals.h
===================================================================
--- branches/DARWIN/coregrind/pub_core_signals.h 2009-01-08 23:52:26 UTC (rev 8927)
+++ branches/DARWIN/coregrind/pub_core_signals.h 2009-01-09 01:07:02 UTC (rev 8928)
@@ -38,7 +38,7 @@
#include "pub_tool_signals.h" // I want to get rid of this header...
/* Highest signal the kernel will let us use */
-// GrP fixme extern Int VG_(max_signal);
+extern Int VG_(max_signal);
/* Use high signals because native pthreads wants to use low */
#define VG_SIGVGKILL (VG_(max_signal)-0)
Modified: branches/DARWIN/include/vki/vki-darwin.h
===================================================================
--- branches/DARWIN/include/vki/vki-darwin.h 2009-01-08 23:52:26 UTC (rev 8927)
+++ branches/DARWIN/include/vki/vki-darwin.h 2009-01-09 01:07:02 UTC (rev 8928)
@@ -87,9 +87,6 @@
#define VKI_MAX_PAGE_SHIFT VKI_PAGE_SHIFT
#define VKI_MAX_PAGE_SIZE VKI_PAGE_SIZE
-// signals
-#define vgPlain_max_signal _VKI_NSIG
-
// types
typedef uint32_t vki_u32;
|