xnu-3789.1.32.tar.gz

[apple/xnu.git] / bsd / sys / sysent.h

diff --git a/bsd/sys/sysent.h b/bsd/sys/sysent.h
index b8d73190d10fac5271f4c95b144d052789cfb37c..8182994d33775aeb1835a8ec69fdd9b51647656e 100644 (file)
--- a/bsd/sys/sysent.h
+++ b/bsd/sys/sysent.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2014 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #ifndef _SYS_SYSENT_H_
@@ -25,29 +31,32 @@
 
 #include <sys/appleapiopts.h>
 #include <sys/cdefs.h>
-#ifdef __ppc__
-#include <sys/types.h>
-#endif
 
 #ifdef KERNEL_PRIVATE
 #ifdef __APPLE_API_PRIVATE
 
 typedef        int32_t sy_call_t(struct proc *, void *, int *);
-typedef        void    sy_munge_t(const void *, void *);
+#if CONFIG_REQUIRES_U32_MUNGING
+typedef        void    sy_munge_t(void *);
+#endif
 
-extern struct sysent {         /* system call table */
-       int16_t         sy_narg;        /* number of args */
-       int8_t          sy_cancel;      /* funnel type */
-       int8_t          sy_funnel;      /* funnel type */
+struct sysent {                /* system call table */
        sy_call_t       *sy_call;       /* implementing function */
-       sy_munge_t      *sy_arg_munge32; /* system call aguments munger for 32-bit process */
-       sy_munge_t      *sy_arg_munge64; /* system call aguments munger for 64-bit process */
+#if CONFIG_REQUIRES_U32_MUNGING || (__arm__ && (__BIGGEST_ALIGNMENT__ > 4))
+       sy_munge_t      *sy_arg_munge32; /* system call arguments munger for 32-bit process */
+#endif
        int32_t         sy_return_type; /* system call return types */
-} sysent[];
+       int16_t         sy_narg;        /* number of args */
+       uint16_t        sy_arg_bytes;   /* Total size of arguments in bytes for
+                                        * 32-bit system calls
+                                        */
+};
 
-/* sy_funnel flags bits */
-#define FUNNEL_MASK    0x00ff
-#define        UNSAFE_64BIT    0x0100
+#ifndef __INIT_SYSENT_C__
+extern struct sysent sysent[];
+#endif /* __INIT_SYSENT_C__ */
+
+extern unsigned int nsysent;
 
 /* 
  * Valid values for sy_cancel
@@ -66,8 +75,7 @@ extern struct sysent {                /* system call table */
 #define _SYSCALL_RET_ADDR_T            4       
 #define _SYSCALL_RET_SIZE_T            5       
 #define _SYSCALL_RET_SSIZE_T   6       
-
-extern int nsysent;
+#define _SYSCALL_RET_UINT64_T  7
 
 #endif /* __APPLE_API_PRIVATE */
 #endif /* KERNEL_PRIVATE */