xnu-1228.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 02e94833a59d50a2dff3c77d10e634b03cf85a3c..4aab31696a7972bdccff6780e0492384e5670d1d 100644 (file)
--- a/osfmk/kern/syscall_sw.h
+++ b/osfmk/kern/syscall_sw.h
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000-2004 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@
@@ -75,12 +73,16 @@ typedef struct {
        int                     (*mach_trap_function)(void);
 #if defined(__i386__)
        boolean_t               mach_trap_stack;
-#else 
+#elif defined(__arm__)
+       /* no space */
+#else
        mach_munge_t            *mach_trap_arg_munge32; /* system call arguments for 32-bit */
        mach_munge_t            *mach_trap_arg_munge64; /* system call arguments for 64-bit */
 #endif
 #if    !MACH_ASSERT
+#if !defined(__arm__)
        int                     mach_trap_unused;
+#endif
 #else
        const char*             mach_trap_name;
 #endif /* !MACH_ASSERT */
@@ -100,6 +102,14 @@ extern int                 mach_trap_count;
 #define MACH_TRAP(name, arg_count, munge32, munge64)           \
                { (arg_count), (int (*)(void)) (name), FALSE, #name }
 #endif /* !MACH_ASSERT */
+#elif defined(__arm__)
+#if    !MACH_ASSERT
+#define        MACH_TRAP(name, arg_count, munge32, munge64)    \
+               { (arg_count), (int (*)(void)) (name) }
+#else
+#define MACH_TRAP(name, arg_count, munge32, munge64)           \
+               { (arg_count), (int (*)(void)) (name), #name }
+#endif /* !MACH_ASSERT */
 #else  /* !defined(__i386__) */
 #if    !MACH_ASSERT
 #define        MACH_TRAP(name, arg_count, munge32, munge64)    \