xnu-3789.51.2.tar.gz

[apple/xnu.git] / osfmk / mach / i386 / syscall_sw.h

diff --git a/osfmk/mach/i386/syscall_sw.h b/osfmk/mach/i386/syscall_sw.h
index ba6723d92b311b6545d06f82baad3ad40695480f..abef968a77077a48bdbe7ae429fd8a163e41aca0 100644 (file)
--- a/osfmk/mach/i386/syscall_sw.h
+++ b/osfmk/mach/i386/syscall_sw.h
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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.
+ * 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -55,9 +53,6 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
-/*
- */
-
 #ifdef PRIVATE
 
 #ifndef        _MACH_I386_SYSCALL_SW_H_
@@ -65,7 +60,6 @@
 
 #include <architecture/i386/asm_help.h>
 
-#if defined(__i386__)
 /*
  * Software interrupt codes for 32-bit system call entry:
  */
@@ -74,30 +68,29 @@
 #define MACHDEP_INT  0x82
 #define DIAG_INT     0x83
 
+#if defined(__i386__)
+
 #ifndef KERNEL
 /*
  * Syscall entry macros for use in libc:
- * [Note that the nop padding is temporary during 4/4 transition.]
  */
-#define SYSENTER_PAD   nop;nop;
-#define SYSCALL_PAD    nop;nop;nop;nop;nop;
 #define UNIX_SYSCALL_TRAP      \
-       SYSCALL_PAD             \
        int $(UNIX_INT)
 #define MACHDEP_SYSCALL_TRAP   \
-       SYSCALL_PAD             \
        int $(MACHDEP_INT)
 
 /*
  * Macro to generate Mach call stubs in libc:
  */
+
 #define kernel_trap(trap_name,trap_number,number_args) \
 LEAF(_##trap_name,0) ;\
-       movl    $##trap_number,%eax     ;\
-       int             $(MACH_INT)             ;\
+       movl    $##trap_number, %eax    ;\
+       call    __sysenter_trap         ;\
 END(_##trap_name)
 
-#endif
+#endif /* !KERNEL */
+
 #endif /* defined(__i386__) */
 
 #if defined(__x86_64__)
@@ -123,7 +116,8 @@ LEAF(_##trap_name,0) ;\
        syscall         ;\
 END(_##trap_name)
 
-#endif
+#endif /* !KERNEL */
+
 #endif /* defined(__x86_64__) */
 
 /*
@@ -142,11 +136,20 @@ END(_##trap_name)
 #define SYSCALL_CLASS_MASK     (0xFF << SYSCALL_CLASS_SHIFT)
 #define SYSCALL_NUMBER_MASK    (~SYSCALL_CLASS_MASK)
 
+#define        I386_SYSCALL_CLASS_MASK         SYSCALL_CLASS_MASK
+#define        I386_SYSCALL_ARG_BYTES_SHIFT    (16)
+#define        I386_SYSCALL_ARG_DWORDS_SHIFT   (I386_SYSCALL_ARG_BYTES_SHIFT + 2)
+#define        I386_SYSCALL_ARG_BYTES_NUM      (64) /* Must be <= sizeof(uu_arg) */
+#define        I386_SYSCALL_ARG_DWORDS_MASK    ((I386_SYSCALL_ARG_BYTES_NUM >> 2) -1)
+#define        I386_SYSCALL_ARG_BYTES_MASK     (((I386_SYSCALL_ARG_BYTES_NUM -1)&~0x3) << I386_SYSCALL_ARG_BYTES_SHIFT)
+#define        I386_SYSCALL_NUMBER_MASK        (0xFFFF)
+
 #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_IPC      5       /* Mach IPC */
 
 /* Macros to simpllfy constructing syscall numbers. */
 #define SYSCALL_CONSTRUCT_MACH(syscall_number) \