xnu-6153.121.1.tar.gz

[apple/xnu.git] / osfmk / kern / syscall_sw.h

diff --git a/osfmk/kern/syscall_sw.h b/osfmk/kern/syscall_sw.h
index 0c7a737d28838d627f970da273333475f9150045..2816a65fc768d8c080dd3d19ebe54c8830dfaea3 100644 (file)
--- a/osfmk/kern/syscall_sw.h
+++ b/osfmk/kern/syscall_sw.h
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, 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,
  * 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@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -60,31 +66,51 @@
  *     its kernel stack.  Some architectures may need
  *     to save more state in the pcb for these traps.
  */
  *     its kernel stack.  Some architectures may need
  *     to save more state in the pcb for these traps.
  */

+#if CONFIG_REQUIRES_U32_MUNGING
+typedef        void    mach_munge_t(void *);
+#elif __arm__ && (__BIGGEST_ALIGNMENT__ > 4)
+typedef        int     mach_munge_t(const void *, void *);
+#endif

 
 typedef struct {
 
 typedef struct {

-       int                     mach_trap_arg_count;
-       int                     (*mach_trap_function)(void);
-       boolean_t       mach_trap_stack;
-#if    !MACH_ASSERT
-       int                     mach_trap_unused;
-#else
-       char*           mach_trap_name;
-#endif /* !MACH_ASSERT */
+       int                     mach_trap_arg_count; /* Number of trap arguments (Arch independant) */
+       kern_return_t           (*mach_trap_function)(void *);
+#if CONFIG_REQUIRES_U32_MUNGING || (__arm__ && (__BIGGEST_ALIGNMENT__ > 4))
+       mach_munge_t            *mach_trap_arg_munge32; /* system call argument munger routine for 32-bit */
+#endif
+       int                     mach_trap_u32_words; /* number of 32-bit words to copyin for U32 */
+#if    MACH_ASSERT
+       const char*             mach_trap_name;
+#endif /* MACH_ASSERT */

 } mach_trap_t;
 
 #define MACH_TRAP_TABLE_COUNT   128
 
 
 } mach_trap_t;
 
 #define MACH_TRAP_TABLE_COUNT   128
 
 

-extern mach_trap_t             mach_trap_table[];
-extern int                             mach_trap_count;
-extern kern_return_t   kern_invalid(void);
+extern const mach_trap_t       mach_trap_table[];
+extern int                     mach_trap_count;
+
+#if CONFIG_REQUIRES_U32_MUNGING || (__arm__ && (__BIGGEST_ALIGNMENT__ > 4))
+
+#if    !MACH_ASSERT
+#define        MACH_TRAP(name, arg_count, u32_arg_words, munge32)      \
+       { (arg_count), (kern_return_t (*)(void *)) (name), munge32, (u32_arg_words)  }
+#else /* !MACH_ASSERT */
+#define        MACH_TRAP(name, arg_count, u32_arg_words, munge32)      \
+       { (arg_count), (kern_return_t (*)(void *)) (name), munge32, (u32_arg_words), #name  }
+#endif /* !MACH_ASSERT */
+
+
+#else /* !CONFIG_REQUIRES_U32_MUNGING || (__arm__ && (__BIGGEST_ALIGNMENT__ > 4)) */

 
 #if    !MACH_ASSERT
 
 #if    !MACH_ASSERT

-#define        MACH_TRAP(name, arg_count)                      \
-               { (arg_count), (int (*)(void)) (name), FALSE, 0 }
-#else
-#define MACH_TRAP(name, arg_count)                     \
-               { (arg_count), (int (*)(void)) (name), FALSE, #name }
+#define        MACH_TRAP(name, arg_count, u32_arg_words, munge32)      \
+       { (arg_count), (kern_return_t (*)(void *)) (name), (u32_arg_words)  }
+#else /* !MACH_ASSERT */
+#define        MACH_TRAP(name, arg_count, u32_arg_words, munge32)      \
+       { (arg_count), (kern_return_t (*)(void *)) (name), (u32_arg_words), #name  }

 #endif /* !MACH_ASSERT */
 
 #endif /* !MACH_ASSERT */
 

+#endif /* !CONFIG_REQUIRES_U32_MUNGING */
+

 #endif /* _KERN_SYSCALL_SW_H_ */
 #endif /* _KERN_SYSCALL_SW_H_ */